[libdap] 08/16: new upstream 3.19.0
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 11:14:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository libdap.
commit f04128503fa71cc8bd6c822f970c966e9e0b6e62
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jun 21 12:42:48 2017 +0100
new upstream 3.19.0
---
Array.cc | 237 +-
Array.h | 6 +-
AttrTable.cc | 4 +-
AttrTable.h | 4 +
BaseType.cc | 206 +-
BaseType.h | 3 +-
Byte.cc | 49 +
Byte.h | 1 +
ChangeLog | 317 +
Connect.cc | 3 +
Constructor.cc | 112 +-
Constructor.h | 5 +-
D4Attributes.cc | 367 +-
D4Attributes.h | 3 +
D4BaseTypeFactory.cc | 58 +-
D4Enum.cc | 142 +-
D4Enum.h | 3 +
D4Group.cc | 137 +-
D4Group.h | 4 +
D4Opaque.cc | 8 +
D4Opaque.h | 3 +
D4ParserSax2.cc | 86 +-
D4ParserSax2.h | 36 +-
DDS.cc | 41 +-
DMR.cc | 145 +-
DMR.h | 6 +
Error.tab.cc | 30 +-
Error.tab.hh | 8 +-
Grid.cc | 164 +-
Grid.h | 2 +-
Int64.cc | 23 +
Int64.h | 1 +
Int8.cc | 26 +
Int8.h | 1 +
Makefile.am | 21 +-
Makefile.in | 1411 +-
NEWS | 11 +
Sequence.cc | 18 +-
Sequence.h | 2 +-
Structure.cc | 82 +-
Structure.h | 3 +-
UInt64.cc | 34 +
UInt64.h | 1 +
Vector.cc | 79 +-
XMLWriter.cc | 1 +
aclocal.m4 | 732 +-
ce_expr.tab.cc | 274 +-
ce_expr.tab.hh | 8 +-
conf/._compile | Bin 0 -> 212 bytes
conf/._config.guess | Bin 0 -> 212 bytes
conf/._config.sub | Bin 0 -> 212 bytes
conf/._depcomp | Bin 0 -> 212 bytes
conf/._install-sh | Bin 0 -> 212 bytes
conf/._libtool.m4 | Bin 0 -> 212 bytes
conf/._ltmain.sh | Bin 0 -> 212 bytes
conf/._ltoptions.m4 | Bin 0 -> 212 bytes
conf/._ltsugar.m4 | Bin 0 -> 212 bytes
conf/._ltversion.m4 | Bin 0 -> 212 bytes
conf/._lt~obsolete.m4 | Bin 0 -> 212 bytes
conf/._missing | Bin 0 -> 212 bytes
conf/._test-driver | Bin 0 -> 212 bytes
conf/compile | 232 +-
conf/config.guess | 405 +-
conf/config.sub | 277 +-
conf/depcomp | 531 +-
conf/gcov_valgrind.m4 | 1 +
conf/install-sh | 35 +-
conf/libtool.m4 | 2007 +-
conf/ltmain.sh | 3976 ++-
conf/ltoptions.m4 | 13 +-
conf/ltversion.m4 | 12 +-
conf/lt~obsolete.m4 | 12 +-
conf/missing | 461 +-
conf/test-driver | 127 +
config.h.in | 22 +-
configure | 31275 +++++++------------
configure.ac | 8 +-
d4_ce/D4ConstraintEvaluator.cc | 4 +-
d4_ce/Makefile.in | 324 +-
d4_ce/d4_ce_parser.tab.cc | 4 +-
d4_ce/d4_ce_parser.tab.hh | 12 +-
d4_ce/location.hh | 8 +-
d4_ce/position.hh | 8 +-
d4_ce/stack.hh | 8 +-
d4_function/Makefile.in | 296 +-
d4_function/d4_function_parser.tab.cc | 4 +-
d4_function/d4_function_parser.tab.hh | 12 +-
d4_function/location.hh | 8 +-
d4_function/position.hh | 8 +-
d4_function/stack.hh | 8 +-
das.tab.cc | 190 +-
das.tab.hh | 4 +-
dds.tab.cc | 154 +-
dds.tab.hh | 8 +-
doxy.conf.in | 9 +-
gl/Makefile.in | 359 +-
lex.Error.cc | 54 +-
lex.ce_expr.cc | 54 +-
lex.das.cc | 54 +-
lex.dds.cc | 54 +-
libdap.spec | 2 +-
mime_util.cc | 16 +
tests/DASTest | 4075 ++-
tests/DDSTest | 5620 ++--
tests/DMRTest | 29410 +++++++----------
tests/EXPRTest | 16724 ++++------
tests/Makefile.in | 703 +-
tests/TestArray.cc | 11 +-
tests/TestSequence.cc | 12 +-
tests/TestSequence.h | 2 +-
tests/TestStructure.cc | 9 +-
tests/TestStructure.h | 2 +-
tests/getdapTest | 1608 +-
tests/package.m4 | 4 +-
unit-tests/ArrayTest.cc | 183 +-
unit-tests/AttrTableTest.cc | 665 +-
unit-tests/ByteTest.cc | 86 +-
unit-tests/D4AsyncDocTest.cc | 334 +-
unit-tests/D4AttributesTest.cc | 119 +-
unit-tests/D4DimensionsTest.cc | 97 +-
unit-tests/D4EnumDefsTest.cc | 118 +-
unit-tests/D4EnumTest.cc | 210 +-
unit-tests/D4FilterClauseTest.cc | 187 +-
unit-tests/D4GroupTest.cc | 167 +-
unit-tests/D4MarshallerTest.cc | 225 +-
unit-tests/D4ParserSax2Test.cc | 127 +-
unit-tests/D4SequenceTest.cc | 95 +-
unit-tests/D4UnMarshallerTest.cc | 86 +-
unit-tests/DASTest.cc | 105 +-
unit-tests/DDSTest.cc | 228 +-
unit-tests/DDXParserTest.cc | 508 +-
unit-tests/DMRTest.cc | 404 +-
unit-tests/DmrRoundTripTest.cc | 329 +
unit-tests/DmrToDap2Test.cc | 493 +
unit-tests/HTTPCacheTest.cc | 103 +-
unit-tests/HTTPConnectTest.cc | 580 +-
unit-tests/MIMEUtilTest.cc | 215 +-
unit-tests/Makefile.am | 8 +-
unit-tests/Makefile.in | 1355 +-
unit-tests/MarshallerTest.cc | 535 +-
unit-tests/RCReaderTest.cc | 191 +-
unit-tests/RegexTest.cc | 112 +-
unit-tests/SequenceTest.cc | 90 +-
unit-tests/ServerFunctionsListUnitTest.cc | 93 +-
unit-tests/SignalHandlerTest.cc | 61 +-
unit-tests/ancT.cc | 128 +-
unit-tests/arrayT.cc | 324 +-
unit-tests/attrTableT.cc | 570 +-
unit-tests/cache-testsuite/Makefile.in | 107 +-
unit-tests/chunked_iostream_test.cc | 612 +-
unit-tests/dasT.cc | 243 +-
unit-tests/dds-testsuite/3B42.980909.5.HDF.dmr | 20 -
.../3B42.980909.5.hacked.2.HDF.attr.dmr | 59 -
unit-tests/dds-testsuite/S2000415.HDF.dmr | 89 -
unit-tests/dds-testsuite/coads_climatology.nc.dmr | 47 -
unit-tests/dds-testsuite/fnoc1.nc.dmr | 26 -
unit-tests/dds-testsuite/test.1.attr.dmr | 22 -
unit-tests/dds-testsuite/test.1.dmr | 6 -
unit-tests/ddsT.cc | 1016 +-
unit-tests/generalUtilTest.cc | 95 +-
unit-tests/marshT.cc | 691 +-
unit-tests/parserUtilTest.cc | 221 +-
unit-tests/sequenceT.cc | 224 +-
unit-tests/structT.cc | 255 +-
unit-tests/testFile.cc | 2 +-
unit-tests/test_config.h | 2 +-
xdr-datatypes.h | 4 +-
167 files changed, 50386 insertions(+), 66640 deletions(-)
diff --git a/Array.cc b/Array.cc
index 36ca16b..659a90e 100644
--- a/Array.cc
+++ b/Array.cc
@@ -42,6 +42,7 @@
#include <sstream>
#include "Array.h"
+#include "Grid.h"
#include "D4Attributes.h"
#include "DMR.h"
@@ -189,52 +190,238 @@ Array::operator=(const Array &rhs)
return *this;
}
-BaseType *
-Array::transform_to_dap4(D4Group *root, Constructor */*container*/)
+void
+Array::transform_to_dap4(D4Group *root, Constructor *container)
{
+ DBG(cerr << __func__ << "() - BEGIN (array:" << name() << ")" << endl;);
Array *dest = static_cast<Array*>(ptr_duplicate());
+ // If it's already a DAP4 object then we can just return it!
+ if(is_dap4()){
+ DBG(cerr << __func__ << "() - Already DAP4 type: Just making a copy and adding to container. " << endl;);
+ container->add_var_nocopy(dest);
+ DBG(cerr << __func__ << "() - END (Already DAP4 type)" << endl;);
+ }
// Process the Array's dimensions, making D4 shared dimensions for
// D2 dimensions that are named. If there is just a size, don't make
// a D4Dimension (In DAP4 you cannot share a dimension unless it has
// a name). jhrg 3/18/14
- D4Dimensions *dims = root->dims();
- for (Array::Dim_iter d = dest->dim_begin(), e = dest->dim_end(); d != e; ++d) {
- if (!(*d).name.empty()) {
+ D4Dimensions *root_dims = root->dims();
+ for (Array::Dim_iter dap2_dim = dest->dim_begin(), e = dest->dim_end(); dap2_dim != e; ++dap2_dim) {
+ if (!(*dap2_dim).name.empty()) {
+ DBG(cerr << __func__ << "() - Processing the array dimension '" << (*dap2_dim).name << "'" << endl;);
+
// If a D4Dimension with the name already exists, use it.
- D4Dimension *d4_dim = dims->find_dim((*d).name);
+ D4Dimension *d4_dim = root_dims->find_dim((*dap2_dim).name);
if (!d4_dim) {
- d4_dim = new D4Dimension((*d).name, (*d).size);
- dims->add_dim_nocopy(d4_dim);
+ d4_dim = new D4Dimension((*dap2_dim).name, (*dap2_dim).size);
+ root_dims->add_dim_nocopy(d4_dim);
+ DBG(cerr << __func__ << "() -" <<
+ " Added NEW D4Dimension '"<< d4_dim->name() << "' (" <<
+ (void *)d4_dim << ") to root->dims()"<< endl;);
}
- // TODO Revisit this decision. jhrg 3/18/14
- // ...in case the name/size are different, make a unique D4Dimension
- // but don't fiddle with the name. Not sure I like this idea, so I'm
- // making the case explicit (could be rolled in to the block above).
- // jhrg 3/18/14
- //
- // This is causing problems in the FITS handler because there are cases
- // where two arrays have dimensions with the same name but different
- // sizes. The deserializing code is using the first size listed, which is
- // wrong in some cases. I'm going to try making this new D4Dimension using
- // the dim name along with the variable name. jhrg 8/15/14
- else if (d4_dim->size() != (unsigned long) (*d).size) {
- d4_dim = new D4Dimension((*d).name + "_" + name(), (*d).size);
- dims->add_dim_nocopy(d4_dim);
+ else {
+ DBG(cerr << __func__ << "() -" <<
+ " Using Existing D4Dimension '"<< d4_dim->name() << "' (" <<
+ (void *)d4_dim << ")"<< endl;);
+
+ if (d4_dim->size() != (unsigned long) (*dap2_dim).size) {
+ // TODO Revisit this decision. jhrg 3/18/14
+ // ...in case the name/size are different, make a unique D4Dimension
+ // but don't fiddle with the name. Not sure I like this idea, so I'm
+ // making the case explicit (could be rolled in to the block above).
+ // jhrg 3/18/14
+ //
+ // This is causing problems in the FITS handler because there are cases
+ // where two arrays have dimensions with the same name but different
+ // sizes. The deserializing code is using the first size listed, which is
+ // wrong in some cases. I'm going to try making this new D4Dimension using
+ // the dim name along with the variable name. jhrg 8/15/14
+ d4_dim = new D4Dimension((*dap2_dim).name + "_" + name(), (*dap2_dim).size);
+ DBG(cerr << __func__ << "() -" <<
+ " Utilizing Name/Size Conflict Naming Artifice. name'"<< d4_dim->name() << "' (" <<
+ (void *)d4_dim << ")"<< endl;);
+ root_dims->add_dim_nocopy(d4_dim);
+ }
}
// At this point d4_dim's name and size == those of (*d) so just set
// the D4Dimension pointer so it matches the one in the D4Group.
- (*d).dim = d4_dim;
+ (*dap2_dim).dim = d4_dim;
}
+
}
// Copy the D2 attributes to D4 Attributes
dest->attributes()->transform_to_dap4(get_attr_table());
-
dest->set_is_dap4(true);
+ container->add_var_nocopy(dest);
+ DBG(cerr << __func__ << "() - END (array:" << name() << ")" << endl;);
+}
+
+bool Array::is_dap2_grid(){
+ bool is_grid = false;
+ if(this->is_dap4()){
+ DBG( cerr << __func__ << "() - Array '"<< name() << "' is DAP4 object!" << endl;)
+ D4Maps *d4_maps = this->maps();
+ is_grid = d4_maps->size(); // It can't be a grid if there are no maps...
+ if(is_grid){
+ DBG( cerr << __func__ << "() - Array '"<< name() << "' has D4Maps." << endl;)
+ // hmmm this might be a DAP2 Grid...
+ D4Maps::D4MapsIter i = d4_maps->map_begin();
+ D4Maps::D4MapsIter e = d4_maps->map_end();
+ while(i!=e){
+ DBG( cerr << __func__ << "() - Map '"<< (*i)->array()->name() << " has " << (*i)->array()->_shape.size() << " dimension(s)." << endl;)
+ if((*i)->array()->_shape.size() > 1){
+ is_grid = false;
+ i = e;
+ }
+ else {
+ i++;
+ }
+ }
+ }
+ else {
+ DBG( cerr << __func__ << "() - Array '"<< name() << "' has no D4Maps." << endl;)
+ }
+ }
+ DBG( cerr << __func__ << "() - is_grid: "<< (is_grid?"true":"false") << endl;)
+ return is_grid;
+}
+
+/**
+ * @brief Transforms this instance of a D4Array into the corresponding DAP2 object.
+ *
+ * This transformation may return an Array or a Grid object. The DAP2 Grid construct
+ * is semantically contained in the DAP4 concept of arrays with Map arrays. If all
+ * of the Maps are one dimensional then the D4Array can be represented as a
+ * Grid object.
+ *
+ * @param The AttrTable pointer parent_attr_table is used by Groups, which disappear
+ * from the DAP2 representation. Their children are returned in the the BAseType vector
+ * their attributes are added to parent_attr_table.
+ * @return A pointer to a vector of BaseType pointers (right?). In this D4Array case
+ * returned vector may contain a DAP2 Array or a Grid. Or, if the Array' prototype is
+ * a type that cannot be represented in DAP2 the return will be NULL.
+ */
+std::vector<BaseType *> *
+Array::transform_to_dap2(AttrTable *){
+ DBG(cerr << __func__ << "() - BEGIN Array '"<< name() << "'" << endl;);
+
+ BaseType *dest;
+ if(is_dap4()){ // Don't convert a DAP2 thing
+
+ // Can Precious be represented as a DAP2 Grid
+ if(is_dap2_grid()){
+ // Oh yay! Grids are special.
+ DBG(cerr << __func__ << "() - Array '"<< name() << "' is dap2 Grid!" << endl;);
+ Grid *g = new Grid(name());
+ dest = g;
+ Array *grid_array = (Array *) this->ptr_duplicate();
+ g->set_array(grid_array);
+
+ // Get the metadata into the Grid
+ AttrTable *grid_attrs = attributes()->get_AttrTable(name());
+ g->set_attr_table(*grid_attrs); // Copy it into the Grid object.
+ // grid_array->set_attr_table(*grid_attrs); // Copy it into the data Array.
+ delete grid_attrs;
+
+ // Clear the Grid data Array attributes.
+ AttrTable at;
+ at.set_name(name());
+ grid_array->set_attr_table(at);
+
+ // Process the Map Arrays.
+ D4Maps *d4_maps = this->maps();
+ vector<BaseType *> dropped_maps;
+ D4Maps::D4MapsIter miter = d4_maps->map_begin();
+ D4Maps::D4MapsIter end = d4_maps->map_end();
+ for( ; miter!=end; miter++){
+ D4Map *d4_map = (*miter);
+ Array *d4_map_array = const_cast<Array*>(d4_map->array());
+ vector<BaseType *> *d2_result = d4_map_array->transform_to_dap2(&(g->get_attr_table()));
+ if(d2_result){
+ if(d2_result->size()>1)
+ throw Error(internal_error,string(__func__)+"() - ERROR: D4Map Array conversion resulted in multiple DAP2 objects.");
+
+ // TODO - This is probably slow and needs a better pattern. const_cast? static_cast?
+ Array *d2_map_array = dynamic_cast<Array *>((*d2_result)[0]);
+ if(d2_map_array){
+ if(d2_map_array->dimensions()!=1)
+ throw Error(internal_error,string(__func__)+"() - ERROR: DAP2 array from D4Map Array conversion has more than 1 dimension.");
+
+ g->add_map(d2_map_array,false);
+ AttrTable at = d2_map_array->get_attr_table();
+ DBG( cerr << __func__ << "() - " <<
+ "DAS For Grid Map '" << d2_map_array->name() << "':" << endl;
+ at.print(cerr); );
+ }
+ else {
+ throw Error(internal_error,string(__func__)+"() - Unable to interpret returned DAP2 content.");
+ }
+ delete d2_result;
+ }
+ else {
+ dropped_maps.push_back(d4_map_array);
+ }
+ }
- return dest;
+ // Did we have a transform failure?
+ if(!dropped_maps.empty()){
+ // Yup... tell the story in the attributes.
+ AttrTable *dv_table = Constructor::make_dropped_vars_attr_table(&dropped_maps);
+ dest->get_attr_table().append_container(dv_table,dv_table->get_name());
+ }
+ }
+ else {
+ // It's not a Grid so we can make a simple copy of our Precious.
+ DBG( cerr << __func__ << "() - Array '"<< name() << "' is not a Grid!" << endl);
+ BaseType *proto = this->prototype();
+ switch(proto->type()){
+ case dods_int64_c:
+ case dods_uint64_c:
+ case dods_enum_c:
+ case dods_opaque_c:
+ {
+ // For now we punt on these type as they have no easy representation in
+ // the DAP2 data model. By setting this to NULL we cause the Array to be
+ // dropped and this will be reflected in the metadata (DAS).
+ dest = NULL;
+ break;
+ }
+ default:
+ {
+ dest = this->ptr_duplicate();
+ // convert the d4 attributes to a dap2 attribute table.
+ AttrTable *attrs = this->attributes()->get_AttrTable(name());
+ dest->set_attr_table(*attrs);
+ dest->set_is_dap4(false);
+ AttrTable at = dest->get_attr_table();
+ DBG( cerr << __func__ << "() - " <<
+ "DAS for new Array '" << dest->name() << "':" << endl;
+ at.print(cerr); )
+
+ break;
+ }
+ }
+ }
+
+ }
+ else {
+ // If it's a DAP2 Array already then we just make a copy of our Precious.
+ dest = this->ptr_duplicate();
+ }
+ // attrs->print(cerr,"",true);
+ vector<BaseType *> *result;
+ if(dest){
+ result = new vector<BaseType *>();
+ result->push_back(dest);
+ }
+ else {
+ result = NULL;
+ }
+ DBG( cerr << __func__ << "() - END Array '"<< name() << "'" << endl;);
+ return result;
}
/**
diff --git a/Array.h b/Array.h
index d448ee4..3d676b3 100644
--- a/Array.h
+++ b/Array.h
@@ -178,6 +178,8 @@ private:
friend class ArrayTest;
friend class D4Group;
+ bool is_dap2_grid();
+
protected:
void _duplicate(const Array &a);
@@ -211,7 +213,8 @@ public:
Array &operator=(const Array &rhs);
virtual BaseType *ptr_duplicate();
- virtual BaseType *transform_to_dap4(D4Group *root, Constructor *container);
+ virtual void transform_to_dap4(D4Group *root, Constructor *container);
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
void add_var(BaseType *v, Part p = nil);
void add_var_nocopy(BaseType *v, Part p = nil);
@@ -283,6 +286,7 @@ public:
virtual bool check_semantics(string &msg, bool all = false);
+
virtual void dump(ostream &strm) const ;
};
diff --git a/AttrTable.cc b/AttrTable.cc
index 92abf38..31fd2c8 100644
--- a/AttrTable.cc
+++ b/AttrTable.cc
@@ -57,7 +57,7 @@ using std::vector;
namespace libdap {
/** Remove %20 space encoding */
-static string remove_space_encoding(const string &s)
+string remove_space_encoding(const string &s)
{
string::size_type pos = s.find("%20");
if (pos != string::npos) {
@@ -74,7 +74,7 @@ static string remove_space_encoding(const string &s)
}
/** Add %20 space encoding. */
-static string add_space_encoding(const string &s)
+string add_space_encoding(const string &s)
{
string::size_type pos = s.find(" ");
if (pos != string::npos) {
diff --git a/AttrTable.h b/AttrTable.h
index 67985e4..d1456cf 100644
--- a/AttrTable.h
+++ b/AttrTable.h
@@ -344,6 +344,10 @@ public:
virtual void dump(ostream &strm) const ;
};
+
+string remove_space_encoding(const string &s);
+string add_space_encoding(const string &s);
+
} // namespace libdap
#endif // _attrtable_h
diff --git a/BaseType.cc b/BaseType.cc
index f6425ad..2a74d6c 100644
--- a/BaseType.cc
+++ b/BaseType.cc
@@ -123,9 +123,9 @@ BaseType::m_duplicate(const BaseType &bt)
@param is_dap4 True if this is a DAP4 variable. Default is False
@see Type */
BaseType::BaseType(const string &n, const Type &t, bool is_dap4)
- : d_name(n), d_type(t), d_dataset(""), d_is_read(false), d_is_send(false),
- d_parent(0), d_attributes(0), d_is_dap4(is_dap4),
- d_in_selection(false), d_is_synthesized(false)
+: d_name(n), d_type(t), d_dataset(""), d_is_read(false), d_is_send(false),
+ d_parent(0), d_attributes(0), d_is_dap4(is_dap4),
+ d_in_selection(false), d_is_synthesized(false)
{}
/** The BaseType constructor needs a name, a dataset, and a type.
@@ -141,9 +141,9 @@ BaseType::BaseType(const string &n, const Type &t, bool is_dap4)
@param is_dap4 True if this is a DAP4 variable.
@see Type */
BaseType::BaseType(const string &n, const string &d, const Type &t, bool is_dap4)
- : d_name(n), d_type(t), d_dataset(d), d_is_read(false), d_is_send(false),
- d_parent(0), d_attributes(0), d_is_dap4(is_dap4),
- d_in_selection(false), d_is_synthesized(false)
+: d_name(n), d_type(t), d_dataset(d), d_is_read(false), d_is_send(false),
+ d_parent(0), d_attributes(0), d_is_dap4(is_dap4),
+ d_in_selection(false), d_is_synthesized(false)
{}
/** @brief The BaseType copy constructor. */
@@ -184,14 +184,14 @@ string BaseType::toString()
{
ostringstream oss;
oss << "BaseType (" << this << "):" << endl
- << " _name: " << name() << endl
- << " _type: " << type_name() << endl
- << " _dataset: " << d_dataset << endl
- << " _read_p: " << d_is_read << endl
- << " _send_p: " << d_is_send << endl
- << " _synthesized_p: " << d_is_synthesized << endl
- << " d_parent: " << d_parent << endl
- << " d_attr: " << hex << &d_attr << dec << endl;
+ << " _name: " << name() << endl
+ << " _type: " << type_name() << endl
+ << " _dataset: " << d_dataset << endl
+ << " _read_p: " << d_is_read << endl
+ << " _send_p: " << d_is_send << endl
+ << " _synthesized_p: " << d_is_synthesized << endl
+ << " d_parent: " << d_parent << endl
+ << " d_attr: " << hex << &d_attr << dec << endl;
return oss.str();
}
@@ -211,19 +211,65 @@ string BaseType::toString()
*
* @return A pointer to the transformed variable
*/
-BaseType *
-BaseType::transform_to_dap4(D4Group */*root*/, Constructor */*container*/)
+void
+BaseType::transform_to_dap4(D4Group */*root*/, Constructor *container)
{
- BaseType *dest = ptr_duplicate();
-
- // Copy the D2 attributes from 'this' to dest's D4 Attributes
- dest->attributes()->transform_to_dap4(get_attr_table());
+ BaseType *dest = ptr_duplicate();
+ // If it's already a DAP4 object then we can just return it!
+ if(!is_dap4()){
+ dest->attributes()->transform_to_dap4(get_attr_table());
+ dest->set_is_dap4(true);
+ }
+ container->add_var_nocopy(dest);
+}
- dest->set_is_dap4(true);
- return dest;
+/** @brief DAP4 to DAP2 transform
+ *
+ * For the current BaseType, return a DAP2 'copy' of the variable.
+ *
+ * @note For most DAP4 types, in this implementation of DAP2 the corresponding
+ * DAP4 type is the same.
+ * These types have a different representations in DAP2 and DAP4:
+ * Sequences (which are D4Sequences in the DAP4 implementation),
+ * - Grids (which are semantically subsumed by coverages in DAP4)
+ * - Arrays (which use shared dimensions in DAP4)
+ *
+ * Additionally DAP4 adds the following types:
+ * - UInt8, Int8, and Char which map to Byte in DAP2.
+ * - Int64, Unit64 which have no natural representation in DAP2.
+ * - Opaque Possible Byte stuff[] plus metadata?
+ * - Enum's can be represented as Int32.
+ *
+ * - Groups, with the exception of the root group "disappear" into the
+ * names of their member variables. Specifically the Group name is add as a prefix
+ * followed by a "/" separator to the names of all of the Group's member groups
+ * variables.
+ *
+ * @param The AttrTable pointer parent_attr_table is used by Groups, which disappear
+ * from the DAP2 representation. Their children are returned in the the BAseType vector
+ * their attributes are added to parent_attr_table;
+ * @return A pointer to a vector of BaseType pointers (right?). In most cases this vector
+ * will contain a single pointer but DAP4 types 'disappear' such as Group will return all
+ * of their member variables in the vector. DAP4 types with no representation in DAP2
+ * (ex: UInt64) the will return a NULL pointer and so this must be tested!
+ */
+std::vector<BaseType *> *
+BaseType::transform_to_dap2(AttrTable *)
+{
+ BaseType *dest = this->ptr_duplicate();
+ // convert the d4 attributes to a dap2 attribute table.
+ AttrTable *attrs = this->attributes()->get_AttrTable(name());
+ dest->set_attr_table(*attrs);
+ dest->set_is_dap4(false);
+ // attrs->print(cerr,"",true);
+
+ vector<BaseType *> *result = new vector<BaseType *>();
+ result->push_back(dest);
+ return result;
}
+
/** @brief dumps information about this object
*
* Displays the pointer value of this instance and then displays information
@@ -236,7 +282,7 @@ void
BaseType::dump(ostream &strm) const
{
strm << DapIndent::LMarg << "BaseType::dump - ("
- << (void *)this << ")" << endl ;
+ << (void *)this << ")" << endl ;
DapIndent::Indent() ;
strm << DapIndent::LMarg << "name: " << name() << endl ;
@@ -276,12 +322,12 @@ BaseType::name() const
string
BaseType::FQN() const
{
- if (get_parent() == 0)
- return name();
- else if (get_parent()->type() == dods_group_c)
- return get_parent()->FQN() + name();
- else
- return get_parent()->FQN() + "." + name();
+ if (get_parent() == 0)
+ return name();
+ else if (get_parent()->type() == dods_group_c)
+ return get_parent()->FQN() + name();
+ else
+ return get_parent()->FQN() + "." + name();
}
/** @brief Sets the name of the class instance. */
@@ -323,10 +369,10 @@ BaseType::set_type(const Type &t)
string
BaseType::type_name() const
{
- if (is_dap4())
- return libdap::D4type_name(d_type);
- else
- return libdap::D2type_name(d_type);
+ if (is_dap4())
+ return libdap::D4type_name(d_type);
+ else
+ return libdap::D2type_name(d_type);
}
/** @brief Returns true if the instance is a numeric, string or URL
@@ -508,7 +554,7 @@ BaseType::send_p()
and <tt>d_is_read</tt> flags are set to TRUE.
@param state The logical state to set the <tt>send_p</tt> flag.
-*/
+ */
void
BaseType::set_send_p(bool state)
{
@@ -582,31 +628,55 @@ BaseType::set_attributes_nocopy(D4Attributes *attrs)
* DDS). They could be modified to use the same AttrTable methods but
* operate on the AttrTable instances in a DDS/BaseType instead of those in
* a DAS.
- *
+ *
* @param at_container Transfer attributes from this container.
* @return void
*/
void BaseType::transfer_attributes(AttrTable *at_container) {
- AttrTable *at = at_container->get_attr_table(name());
-
- DBG(cerr << "In BaseType::transfer_attributes; processing " << name() << endl);
-
- if (at) {
- at->set_is_global_attribute(false);
- DBG(cerr << "Processing AttrTable: " << at->get_name() << endl);
-
- AttrTable::Attr_iter at_p = at->attr_begin();
- while (at_p != at->attr_end()) {
- DBG(cerr << "About to append " << "attr name, type:" << at->get_name(at_p) << ", " << at->get_type(at_p) << endl);
- if (at->get_attr_type(at_p) == Attr_container)
- get_attr_table().append_container(new AttrTable(*at->get_attr_table(at_p)), at->get_name(at_p));
- else
- get_attr_table().append_attr(at->get_name(at_p), at->get_type(at_p), at->get_attr_vector(at_p));
+ DBG(cerr << __func__ << "() - BEGIN name:'" << name() << "'" << endl);
+
+ AttrTable *at = at_container->get_attr_table(name());
+ DBG(cerr << __func__ << "() - at: "<< (void *) at << endl);
+
+
+ if (at) {
+ at->set_is_global_attribute(false);
+ DBG(cerr << __func__ << "() - Processing AttrTable: " << at->get_name() << endl);
+
+ AttrTable::Attr_iter at_p = at->attr_begin();
+ while (at_p != at->attr_end()) {
+ DBG(cerr << __func__ << "() - Attribute '" << at->get_name(at_p) << "' is type: " << at->get_type(at_p) << endl);
+ if (at->get_attr_type(at_p) == Attr_container){
+ // An attribute container may actually represent a child member variable. When
+ // that's the case we don't want to add the container to the parent type, but
+ // rather let any child of BaseType deal with those containers in the child's
+ // overridden transfer_attributes() method.
+ // We capitalize on the magic of the BaseType API and utilize the var() method
+ // to check for a child variable of the same name and, if one exists, we'll skip
+ // this AttrTable and let a child constructor class like Grid or Constructor
+ // deal with it.
+ BaseType *bt = var(at->get_name(at_p),true);
+ if(bt==0){
+ DBG(cerr << __func__ << "() - Adding container '" << at->get_name(at_p) << endl);
+ get_attr_table().append_container(new AttrTable(*at->get_attr_table(at_p)), at->get_name(at_p));
+ }
+ else {
+ DBG(cerr << __func__ << "() - Found child var: '"<< bt->type_name()<< " " << bt->name() << " (address:" << (void *) bt << ")" << endl);
+ DBG(cerr << __func__ << "() - Skipping container '" << at->get_name(at_p) << endl);
+ }
+ }
+ else {
+ DBG(cerr << __func__ << "() - Adding Attribute '" << at->get_name(at_p) << endl);
+ get_attr_table().append_attr(at->get_name(at_p), at->get_type(at_p), at->get_attr_vector(at_p));
+ }
+ at_p++;
+ }
+ }
+ else {
+ DBG(cerr << __func__ << "() - Unable to locate AttrTable '" << name() << "' SKIPPING" << endl);
- at_p++;
- }
- }
+ }
}
/** Does this variable appear in either the selection part or as a function
@@ -857,25 +927,25 @@ BaseType::intern_data(/*Crc32 &checksum, DMR &, ConstraintEvaluator &*/)
bool
BaseType::serialize(ConstraintEvaluator &, DDS &, Marshaller &, bool)
{
- throw InternalErr(__FILE__, __LINE__, "The DAP2 serialize() method has not been implemented for " + type_name());
+ throw InternalErr(__FILE__, __LINE__, "The DAP2 serialize() method has not been implemented for " + type_name());
}
bool
BaseType::deserialize(UnMarshaller &, DDS *, bool)
{
- throw InternalErr(__FILE__, __LINE__, "The DAP2 deserialize() method has not been implemented for " + type_name());
+ throw InternalErr(__FILE__, __LINE__, "The DAP2 deserialize() method has not been implemented for " + type_name());
}
void
BaseType::serialize(D4StreamMarshaller &, DMR &, /*ConstraintEvaluator &,*/ bool)
{
- throw InternalErr(__FILE__, __LINE__, "The DAP4 serialize() method has not been implemented for " + type_name());
+ throw InternalErr(__FILE__, __LINE__, "The DAP4 serialize() method has not been implemented for " + type_name());
}
void
BaseType::deserialize(D4StreamUnMarshaller &, DMR &)
{
- throw InternalErr(__FILE__, __LINE__, "The DAP4 deserialize() method has not been implemented for " + type_name());
+ throw InternalErr(__FILE__, __LINE__, "The DAP4 deserialize() method has not been implemented for " + type_name());
}
/** Write the variable's declaration in a C-style syntax. This
@@ -919,10 +989,10 @@ BaseType::deserialize(D4StreamUnMarshaller &, DMR &)
@see DDS
@see DDS::CE
-*/
+ */
void
BaseType::print_decl(FILE *out, string space, bool print_semi,
- bool constraint_info, bool constrained)
+ bool constraint_info, bool constrained)
{
ostringstream oss;
print_decl(oss, space, print_semi, constraint_info, constrained);
@@ -970,10 +1040,10 @@ BaseType::print_decl(FILE *out, string space, bool print_semi,
@see DDS
@see DDS::CE
-*/
+ */
void
BaseType::print_decl(ostream &out, string space, bool print_semi,
- bool constraint_info, bool constrained)
+ bool constraint_info, bool constrained)
{
// if printing the constrained declaration, exit if this variable was not
// selected.
@@ -990,7 +1060,7 @@ BaseType::print_decl(ostream &out, string space, bool print_semi,
}
if (print_semi)
- out << ";\n" ;
+ out << ";\n" ;
}
/** Prints the value of the variable, with its declaration. This
@@ -1061,8 +1131,8 @@ BaseType::print_xml_writer(XMLWriter &xml, bool constrained)
throw InternalErr(__FILE__, __LINE__, "Could not write " + type_name() + " element");
if (!name().empty())
- if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
- throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
+ if (xmlTextWriterWriteAttribute(xml.get_writer(), (const xmlChar*) "name", (const xmlChar*)name().c_str()) < 0)
+ throw InternalErr(__FILE__, __LINE__, "Could not write attribute for name");
if (is_dap4())
attributes()->print_dap4(xml);
@@ -1125,7 +1195,7 @@ BaseType::print_dap4(XMLWriter &xml, bool constrained)
semantics of the member variables, too.
@see DDS::check_semantics
-*/
+ */
bool
BaseType::check_semantics(string &msg, bool)
{
@@ -1172,7 +1242,7 @@ BaseType::check_semantics(string &msg, bool)
<tt>LESS</tt>, <tt>LESS_EQL</tt>, and <tt>REGEXP</tt>.
@return The boolean value of the comparison.
@see BaseType::d4_ops(BaseType *, int)
-*/
+ */
bool
BaseType::ops(BaseType *, int)
{
@@ -1221,9 +1291,9 @@ BaseType::d4_ops(BaseType *, int)
unsigned int
BaseType::width(bool /* constrained */) const
{
- throw InternalErr(__FILE__, __LINE__, "not implemented");
+ throw InternalErr(__FILE__, __LINE__, "not implemented");
#if 0
- return width(constrained);
+ return width(constrained);
#endif
}
diff --git a/BaseType.h b/BaseType.h
index f83f443..7338eac 100644
--- a/BaseType.h
+++ b/BaseType.h
@@ -157,7 +157,8 @@ public:
virtual string toString();
- virtual BaseType *transform_to_dap4(D4Group *root, Constructor *container);
+ virtual void transform_to_dap4(D4Group *root, Constructor *container);
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
virtual void dump(ostream &strm) const ;
diff --git a/Byte.cc b/Byte.cc
index acbe05b..7644d56 100644
--- a/Byte.cc
+++ b/Byte.cc
@@ -33,6 +33,7 @@
//
// jhrg 9/7/94
+//#define DODS_DEBUG
#include "config.h"
@@ -57,9 +58,11 @@
#include "UnMarshaller.h"
#include "DMR.h"
+#include "D4Attributes.h"
#include "D4StreamMarshaller.h"
#include "D4StreamUnMarshaller.h"
+#include "debug.h"
#include "util.h"
#include "parser.h"
#include "dods-limits.h"
@@ -320,6 +323,52 @@ bool Byte::d4_ops(BaseType *b, int op)
}
}
+
+
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * Return a DAP2 'copy' of the variable.
+ *
+ * NOTE: This little bit of magic ensures that the DAP4 shenanigans
+ * in which UInt8, Char , and Byte are synonymous is reduced
+ * to the DAP2 simplicity of Byte.
+ *
+ *
+ * @param root The root group that should hold this new variable. Add Group-level
+ * stuff here (e.g., D4Dimensions).
+ * @param container Add the new variable to this container.
+ *
+ * @return A pointer to the transformed variable
+ */
+std::vector<BaseType *> *
+Byte::transform_to_dap2(AttrTable *parent_attr_table)
+{
+ DBG(cerr << __func__ << "() - BEGIN" << endl;);
+ vector<BaseType *> *vec = BaseType::transform_to_dap2(parent_attr_table);
+ if(vec->size()!=1){
+ ostringstream oss;
+ oss << __func__ << "() - Something Bad Happened. This transform should produce only ";
+ oss << " a single BaseType yet it produced " << vec->size();
+ throw new Error(internal_error,oss.str());
+ }
+
+ BaseType *dest = (*vec)[0];
+ DBG(cerr << __func__ << "() - type(): " << type() << endl;);
+ DBG(cerr << __func__ << "() - dest->type(): " << dest->type() << endl;);
+
+ // This little bit of magic ensures that the DAP4 shenanigans
+ // in which UInt8, Char , and Byte are synonymous is reduced
+ // to the DAP2 simplicity of Byte.
+ if(type()!=dods_byte_c){
+ dest->set_type(dods_byte_c);
+ }
+ DBG (dest->get_attr_table().print(cerr););
+
+ DBG(cerr << __func__ << "() - END" << endl;);
+ return vec;
+}
+
/** @brief dumps information about this object
*
* Displays the pointer value of this instance and information about this
diff --git a/Byte.h b/Byte.h
index c916c49..a2ef04d 100644
--- a/Byte.h
+++ b/Byte.h
@@ -97,6 +97,7 @@ public:
virtual bool ops(BaseType *b, int op);
virtual bool d4_ops(BaseType *b, int op);
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
virtual void dump(ostream &strm) const ;
};
diff --git a/ChangeLog b/ChangeLog
index 7c2978b..e756e2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,320 @@
+2017-05-22 Nathan Potter <ndp at opendap.org>
+
+ Merge pull request #29 from OPENDAP/hyrax390
+ Task #390. The CppUnit unit tests in libdap4 should all support runni…
+
+ Merge pull request #31 from OPENDAP/hyrax-400
+ Hyrax 400
+
+2017-05-19 James Gallagher <jgallagher at opendap.org>
+
+ Fixed vec_resize() in Vector.
+ I was mixing cpacity() and resize() and that leads to some odd
+ behavior - I'm not sure I really understand it, but comments in
+ Vector::vec_resize() are a stab at an explanation. The bottom line
+ is that the fix is to use size() with resize() and not capacity().
+ I also modified TestArray so that its read() method allocates
+ enough space for a vector of Structures before it starts writing
+ to it, just to demonstrate good behavior.
+
+2017-05-19 Slav Korolev <slav.korolev at nasa.gov>
+
+ #390. More changes
+
+2017-05-18 James Gallagher <jgallagher at opendap.org>
+
+ Checkpoint
+
+ Checkpoint - run using valgrind on centos
+
+2017-05-18 Slav Korolev <slav.korolev at nasa.gov>
+
+ Merge branch 'master' into hyrax390
+
+2017-05-17 James Gallagher <jgallagher at opendap.org>
+
+ I edited the ByteTest.cc file so it compiles and works.
+
+2017-05-17 Nathan Potter <ndp at opendap.org>
+
+ Merge pull request #30 from OPENDAP/attr_bug
+ Attr bug
+
+2017-05-17 ndp-opendap <ndp at opendap.org>
+
+ Dropped references to missing files.
+
+2017-05-17 Slav Korolev <slav.korolev at nasa.gov>
+
+ "Task #390."
+
+2017-05-16 ndp-opendap <ndp at opendap.org>
+
+ instrumentaiton
+
+2017-05-12 ndp-opendap <ndp at opendap.org>
+
+ Fixed possible null pointer deref
+
+ Dropped unused file
+
+2017-05-11 Nathan Potter <ndp at opendap.org>
+
+ Merge pull request #26 from OPENDAP/dmr2dds
+ Dmr2dds
+
+2017-05-11 ndp-opendap <ndp at opendap.org>
+
+ Changed return value of transform_to_dap4() to void.
+
+2017-05-10 Nathan Potter <ndp at opendap.org>
+
+ Merge branch 'master' into dmr2dds
+
+2017-05-09 ndp-opendap <ndp at opendap.org>
+
+ Fixed bad implmentations of transform_to_dap4 in Test classes. Instrumenttion
+
+ Fixed bad implmentations of transform_to_dap4 in Test classes. Instrumenttion
+
+2017-05-08 ndp-opendap <ndp at opendap.org>
+
+ Reworked transform_to_dap4() implmentation so that they all (in libdap4) return NULL and populate the container passed in. Next will be to change the return from BAseType* to void
+
+ Reworked transform_to_dap4() implmentation so that they all (in libdap4) return NULL and populate the container passed in. Next will be to change the return from BAseType* to void
+
+ First pass at fixing the duplicate variables bug in DMR::build_using_dds() and Grid::transform_to_dap4()
+
+2017-05-06 ndp-opendap <ndp at opendap.org>
+
+ Patched DMR tests to use the new CppUnit test pattern.
+
+2017-05-05 ndp-opendap <ndp at opendap.org>
+
+ Repairing baselines
+
+ Fixed Grid::transform_to_dap4() so maps have correct names (FQN names)
+
+ Fixed Grid::transform_to_dap4() so maps have correct names (FQN names)
+
+ Fixed namespace issue in tests that prevented individual tests from being run byt command line parameters.
+
+2017-05-04 ndp-opendap <ndp at opendap.org>
+
+ Alternate Array assignment in Grid::transform_to_dap4()
+
+ sync
+
+ Stuff
+
+2017-05-04 James Gallagher <jgallagher at opendap.org>
+
+ Merge pull request #27 from OPENDAP/new_docs_target
+ New docs target
+
+2017-05-04 ndp-opendap <ndp at opendap.org>
+
+ A stab at correcting the FQN issue described in Hyrax-389
+
+2017-05-04 James Gallagher <jgallagher at opendap.org>
+
+ Removed unused tests.
+ Grid::transform_to_dap4() had used dynamic_cast<>() but now uses
+ static_cast<>(), so it no longer needs to test for null returns from
+ the cast operator.
+
+2017-05-04 ndp-opendap <ndp at opendap.org>
+
+ Supressing warnings
+
+ Merge branch 'master' into dmr2dds
+
+2017-05-04 James Gallagher <jgallagher at opendap.org>
+
+ Merge pull request #28 from OPENDAP/dmr_parser_fix
+ Fixed fixed length line limit in the DMR Sax parser
+
+2017-05-04 ndp-opendap <ndp at opendap.org>
+
+ Added some DAP4 related TODO items.
+
+ Added some DAP4 related TODO items.
+
+ Merge branch 'master' into dmr2dds
+
+ unwinding small change
+
+2017-05-03 James Gallagher <jgallagher at opendap.org>
+
+ Changed class field names so they start with 'd_'
+ modified: D4ParserSax2.cc
+ modified: D4ParserSax2.h
+
+ Fixed fixed length line limit in the DMR Sax parser
+ modified: D4ParserSax2.cc
+
+2017-05-03 ndp-opendap <ndp at opendap.org>
+
+ Updated .gitignore for new test executables
+
+ Adding two more working DMR to Grid tests. Failing test still fails.
+
+ Checking in new dmr2Grid test which fails because the supplied DMR fails to parse, despite the fact that it was generated by Hyrax 1.13.3
+
+ Added new dmr2dds with Grid test.
+
+ Added new dmr2dds with Grid test.
+
+ Updating comments etc.
+
+ Updating comments etc.
+
+2017-05-02 ndp-opendap <ndp at opendap.org>
+
+ Ooops. Forgot test baseline
+
+ Silencing more debug chatter.
+
+ Silencing more debug chatter.
+
+ First cut at extracting dap2 Grid objects from dap4 Arrays with maps.
+
+ First cut at extracting dap2 Grid objects from dap4 Arrays with maps.
+
+ Turned off compiled in debug.
+
+ Refactored the transform_to_dap2() aip. woot.
+
+2017-05-02 James Gallagher <jgallagher at opendap.org>
+
+ Modified Makefile.am to use the new build-gh-docs.sh script.
+ This seems to work, although I think it might be fragile.
+
+ A better way to build the docs and push them to gh-pages new file: build-gh-docs.sh
+
+ Working on using a script instead of makefile targets modified: Makefile.am
+
+ modified: .gitignore
+
+ Fixed spaces/tabs in Makefile.am
+
+ deleted: doxy_private.conf
+
+ Modified doxy.conf.in so it writes output to 'html'
+ It used to write output to docs/html.
+
+ I added the new docs targets to the Makefile.am
+ These will build and commit/push doxygen docs to github.io via gh-pages.
+ The gh-pages branch has to be made first and should be empty.
+
+2017-04-28 ndp-opendap <ndp at opendap.org>
+
+ Weekend update baby... More tests working. Need to sort out Groups next.
+
+ Refactored DMR test suite, add round-trip and dmr_to_dap2 test suites.
+
+2017-04-26 James Gallagher <jgallagher at opendap.org>
+
+ Added -g3 to the coverage flags
+
+ Removed generated docs
+
+ Deploy to GitHub Pages
+
+2017-04-26 ndp-opendap <ndp at opendap.org>
+
+ Still dorting tests
+
+2017-04-25 ndp-opendap <ndp at opendap.org>
+
+ Merged master to dmr2dds branch
+
+ Structures now transfer attributes correctly
+
+ Space indented BAseType (why was it not before?)
+
+ Structures now transfer attributes correctly
+
+2017-04-24 ndp-opendap <ndp at opendap.org>
+
+ Structures now transfer attributes correctly
+
+ Structures now transfer attributes correctly
+
+ sync
+
+ Provisional patch to DMR.print_das()
+
+2017-04-23 ndp-opendap <ndp at opendap.org>
+
+ Provisional patch to DMR.print_das()
+
+2017-04-21 ndp-opendap <ndp at opendap.org>
+
+ Created DMR specific testsuite. Migrated exisiting DMR tests from dds-testsuite.
+
+ TEst draft (broken)
+
+2017-04-20 ndp-opendap <ndp at opendap.org>
+
+ sync
+
+2017-04-18 James Gallagher <jgallagher at opendap.org>
+
+ Added comments to Connect and mime_util regarding tainted data
+
+ Fixed minor issue in D4ParserSax2.
+ The namespace prefix could be null and was passed directly to
+ std::string's ctor
+
+ Fixed for potential issue in D4ConstraintEvaluator.
+ The pointer 'dim' could be dereferenced when it was null.
+
+2017-02-17 James Gallagher <jgallagher at opendap.org>
+
+ Travis should work now...
+ We need a better way to test changes to this process
+
+2017-02-16 James Gallagher <jgallagher at opendap.org>
+
+ Removed codecov.io from the build.
+ Debug on CentOS and stop hacking at Travis...
+
+ Added libgcov a an attempt to fix the travis build.
+
+ Turn on coverage in travis.yml
+
+ more travis hacks
+
+ travis hacks for code cov io
+
+ more travis hacks
+
+ another tack for travis and codecov...
+
+ tedious... (still travis debugging)
+
+ travis test...
+
+ travis.yml fix for codecov.io
+
+ Mods for codecov.io (https://codecov.io/gh/OPENDAP/libdap4)
+
+ Added code coverage to travis.yml
+
+ Merge branch 'master' of http://github.com/opendap/libdap4
+
+ Added code coverage script (get_code_cov.sh)
+
+2017-02-08 James Gallagher <jgallagher at opendap.org>
+
+ Hacked up gitignore for various build stuff [ci skip]
+
+2017-01-06 James Gallagher <jgallagher at opendap.org>
+
+ Version 3.18.3
+
+ Modified etags for the files at the new test.o.o site.
2016-12-08 James Gallagher <jgallagher at opendap.org>
Merge pull request #25 from OPENDAP/chunked_istream_bug
diff --git a/Connect.cc b/Connect.cc
index e326496..36a6213 100644
--- a/Connect.cc
+++ b/Connect.cc
@@ -240,6 +240,9 @@ void Connect::process_data(DDS &data, Response *rs)
(\r\n) and Newlines (\n). In either case, the line terminators are removed
before each header is processed.
+ @note FIXME The code uses tainted data via get_next_mime_header() whcih
+ should be fixed. See the note in mime_util.cc
+
@param data_source Read from this stream.
@param rs Value/Result parameter. Dump version and type information here.
*/
diff --git a/Constructor.cc b/Constructor.cc
index ff8e44a..ca7b2f7 100644
--- a/Constructor.cc
+++ b/Constructor.cc
@@ -50,15 +50,19 @@
#include "XMLWriter.h"
#include "D4StreamMarshaller.h"
#include "D4StreamUnMarshaller.h"
+#include "D4Group.h"
#include "D4Attributes.h"
-#include "debug.h"
#include "escaping.h"
#include "util.h"
#include "Error.h"
#include "InternalErr.h"
+
+// #define DODS_DEBUG 1
+#include "debug.h"
+
using namespace std;
namespace libdap {
@@ -133,25 +137,46 @@ Constructor::operator=(const Constructor &rhs)
}
// A public method, but just barely...
-BaseType *
+void
Constructor::transform_to_dap4(D4Group *root, Constructor *dest)
{
+ DBG(cerr << __func__ << "() - BEGIN (name:"<< name() <<
+ ")(type:"<< type_name()<<
+ ")(root:'"<< root->name()<<"':"<<(void*)root <<
+ ")(dest:'"<< dest->name()<<"':"<< (void *) dest<< ")"
+ << endl;);
+
for (Constructor::Vars_citer i = var_begin(), e = var_end(); i != e; ++i) {
- BaseType *new_var = (*i)->transform_to_dap4(root, dest);
- if (new_var) { // Might be a Grid; see the comment in BaseType::transform_to_dap4()
- new_var->set_parent(dest);
- dest->add_var_nocopy(new_var);
- }
+ BaseType *d4_var = dest->var((*i)->name());
+ // Don't add duplicate variables. We have to make this check
+ // because some of the child variables may add arrays
+ // to the root object. For example, this happens in
+ // Grid with the Map Arrays - ndp - 05/08/17
+ if(!d4_var){
+ /*
+ BaseType *new_var = (*i)->transform_to_dap4(root, dest);
+ if (new_var) { // Might be a Grid; see the comment in BaseType::transform_to_dap4()
+ new_var->set_parent(dest);
+ dest->add_var_nocopy(new_var);
+ }
+ */
+ DBG(cerr << __func__ << "() - Transforming variable: '" <<
+ (*i)->name() << "'" << endl; );
+ (*i)->transform_to_dap4(root /*group*/, dest /*container*/);
+ }
+ else {
+ DBG(cerr << __func__ << "() - Skipping variable: " <<
+ d4_var->type_name() << " " << d4_var->name() << " because a variable with" <<
+ " this name already exists in the root group." << endl; );
+ }
}
-
- // Add attributes
- dest->attributes()->transform_to_dap4(get_attr_table());
-
+ dest->attributes()->transform_to_dap4(get_attr_table());
dest->set_is_dap4(true);
-
- return dest;
+ DBG(cerr << __func__ << "() - END (name:"<< name() << ")(type:"<< type_name()<< ")" << endl;);
}
+
+
string
Constructor::FQN() const
{
@@ -815,6 +840,67 @@ Constructor::set_in_selection(bool state)
BaseType::set_in_selection(state);
}
+
+void Constructor::transfer_attributes(AttrTable *at_container)
+{
+ AttrTable *at = at_container->get_attr_table(name());
+ DBG(cerr << "Constructor::transfer_attributes() - processing " << name() << "' addr: "<< (void*) at << endl);
+ if (at) {
+ BaseType::transfer_attributes(at_container);
+ for (Vars_iter i = d_vars.begin(); i != d_vars.end(); i++) {
+ BaseType *bt = (*i);
+ bt->transfer_attributes(at);
+ }
+
+ }
+}
+
+AttrTable *
+Constructor::make_dropped_vars_attr_table(vector<BaseType *> *dropped_vars) {
+ DBG( cerr << __func__ << "() - BEGIN" << endl;);
+
+ AttrTable *dv_table = NULL;
+ if(!dropped_vars->empty()){
+ dv_table = new AttrTable;
+ dv_table->set_name("dap4:dropped_members");
+ vector<BaseType *>::iterator dvIter = dropped_vars->begin();
+ vector<BaseType *>::iterator dvEnd = dropped_vars->end();
+ unsigned int i = 0;
+ for( ; dvIter!=dvEnd ; dvIter++, i++){
+ BaseType *bt = (*dvIter);
+ AttrTable *bt_attr_table = new AttrTable(bt->get_attr_table());
+ bt_attr_table->set_name(bt->name());
+ string type_name = bt->type_name();
+ if(bt->is_vector_type()){
+ Array *array = dynamic_cast <Array *>(bt);
+ if(array){
+ type_name = array->prototype()->type_name();
+ DBG( cerr << __func__ << "() - The variable " << bt->name() << " is an Array of '"<< type_name << "'" << endl;);
+ Array::Dim_iter d_iter = array->dim_begin();
+ Array::Dim_iter end = array->dim_end();
+ for( ; d_iter< end ; d_iter++){
+
+ ostringstream dim_size;
+ dim_size << (*d_iter).size;
+ bt_attr_table->append_attr(
+ "array_dimensions",
+ AttrType_to_String(Attr_uint32),
+ dim_size.str());
+ }
+ }
+ }
+ bt_attr_table->append_attr("dap4:type","String", type_name);
+ dv_table->append_container(bt_attr_table,bt_attr_table->get_name());
+ // Clear entry now that we're done.
+ (*dvIter) = 0;
+ }
+ }
+ DBG( cerr << __func__ << "() - END " << endl;);
+ return dv_table;
+
+}
+
+
/** @brief dumps information about this object
*
* Displays the pointer value of this instance and information about this
diff --git a/Constructor.h b/Constructor.h
index 961c831..79d8f6f 100644
--- a/Constructor.h
+++ b/Constructor.h
@@ -65,7 +65,7 @@ public:
virtual ~Constructor();
Constructor &operator=(const Constructor &rhs);
- BaseType *transform_to_dap4(D4Group *root, Constructor *dest);
+ virtual void transform_to_dap4(D4Group *root, Constructor *dest);
virtual std::string FQN() const;
@@ -148,6 +148,9 @@ public:
virtual bool check_semantics(string &msg, bool all = false);
+ virtual void transfer_attributes(AttrTable *at);
+ static AttrTable *make_dropped_vars_attr_table(vector<BaseType *> *dropped_vars);
+
virtual void dump(ostream &strm) const ;
};
diff --git a/D4Attributes.cc b/D4Attributes.cc
index 6ea2629..11c2507 100644
--- a/D4Attributes.cc
+++ b/D4Attributes.cc
@@ -43,65 +43,65 @@ namespace libdap {
string D4AttributeTypeToString(D4AttributeType at)
{
switch(at) {
- case attr_null_c:
- return "null";
+ case attr_null_c:
+ return "null";
- case attr_byte_c:
- return "Byte";
+ case attr_byte_c:
+ return "Byte";
- case attr_int16_c:
- return "Int16";
+ case attr_int16_c:
+ return "Int16";
- case attr_uint16_c:
- return "UInt16";
+ case attr_uint16_c:
+ return "UInt16";
- case attr_int32_c:
- return "Int32";
+ case attr_int32_c:
+ return "Int32";
- case attr_uint32_c:
- return "UInt32";
+ case attr_uint32_c:
+ return "UInt32";
- case attr_float32_c:
- return "Float32";
+ case attr_float32_c:
+ return "Float32";
- case attr_float64_c:
- return "Float64";
+ case attr_float64_c:
+ return "Float64";
- case attr_str_c:
- return "String";
+ case attr_str_c:
+ return "String";
- case attr_url_c:
- return "Url";
+ case attr_url_c:
+ return "Url";
// Added for DAP4
- case attr_int8_c:
- return "Int8";
+ case attr_int8_c:
+ return "Int8";
- case attr_uint8_c:
- return "UInt8";
+ case attr_uint8_c:
+ return "UInt8";
- case attr_int64_c:
- return "Int64";
+ case attr_int64_c:
+ return "Int64";
- case attr_uint64_c:
- return "UInt64";
+ case attr_uint64_c:
+ return "UInt64";
- case attr_enum_c:
- return "Enum";
+ case attr_enum_c:
+ return "Enum";
- case attr_opaque_c:
- return "Opaque";
+ case attr_opaque_c:
+ return "Opaque";
// These are specific to attributes while the other types are
// also supported by the variables. jhrg 4/17/13
- case attr_container_c:
- return "Container";
+ case attr_container_c:
+ return "Container";
- case attr_otherxml_c:
- return "OtherXML";
+ case attr_otherxml_c:
+ return "OtherXML";
- default:
- throw InternalErr(__FILE__, __LINE__, "Unsupported attribute type");
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Unsupported attribute type");
}
}
@@ -185,93 +185,170 @@ D4Attribute::attributes()
/** @brief copy attributes from DAP2 to DAP4
*
- * Given a DAP2 AttrTable, copy all of its attributes into a DAP4 D4Attributes
- * object.
+ * Given a DAP2 AttrTable, copy all of its attributes into
+ * this DAP4 D4Attributes object as D4Attribute object instances.
+ *
*
* @param at Read the DAP2 attributes from here.
*/
void
D4Attributes::transform_to_dap4(AttrTable &at)
{
- // for every attribute in at, copy it to this.
- for (AttrTable::Attr_iter i = at.attr_begin(), e = at.attr_end(); i != e; ++i) {
- string name = at.get_name(i);
- AttrType type = at.get_attr_type(i);
-
- switch (type) {
- case Attr_container: {
- D4Attribute *a = new D4Attribute(name, attr_container_c);
- D4Attributes *attributes = a->attributes(); // allocates a new object
- attributes->transform_to_dap4(*at.get_attr_table(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_byte: {
- D4Attribute *a = new D4Attribute(name, attr_byte_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_int16: {
- D4Attribute *a = new D4Attribute(name, attr_int16_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_uint16: {
- D4Attribute *a = new D4Attribute(name, attr_uint16_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_int32: {
- D4Attribute *a = new D4Attribute(name, attr_int32_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_uint32: {
- D4Attribute *a = new D4Attribute(name, attr_uint32_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_float32: {
- D4Attribute *a = new D4Attribute(name, attr_float32_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_float64: {
- D4Attribute *a = new D4Attribute(name, attr_float64_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_string: {
- D4Attribute *a = new D4Attribute(name, attr_str_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_url: {
- D4Attribute *a = new D4Attribute(name, attr_url_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- case Attr_other_xml: {
- D4Attribute *a = new D4Attribute(name, attr_otherxml_c);
- a->add_value_vector(*at.get_attr_vector(i));
- add_attribute_nocopy(a);
- break;
- }
- default:
- throw InternalErr(__FILE__, __LINE__, "Unknown DAP2 attribute type in D4Attributes::copy_from_dap2()");
- }
- }
+ // for every attribute in at, copy it to this.
+ for (AttrTable::Attr_iter i = at.attr_begin(), e = at.attr_end(); i != e; ++i) {
+ string name = at.get_name(i);
+ AttrType type = at.get_attr_type(i);
+
+ switch (type) {
+ case Attr_container: {
+ D4Attribute *a = new D4Attribute(name, attr_container_c);
+ D4Attributes *attributes = a->attributes(); // allocates a new object
+ attributes->transform_to_dap4(*at.get_attr_table(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_byte: {
+ D4Attribute *a = new D4Attribute(name, attr_byte_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_int16: {
+ D4Attribute *a = new D4Attribute(name, attr_int16_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_uint16: {
+ D4Attribute *a = new D4Attribute(name, attr_uint16_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_int32: {
+ D4Attribute *a = new D4Attribute(name, attr_int32_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_uint32: {
+ D4Attribute *a = new D4Attribute(name, attr_uint32_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_float32: {
+ D4Attribute *a = new D4Attribute(name, attr_float32_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_float64: {
+ D4Attribute *a = new D4Attribute(name, attr_float64_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_string: {
+ D4Attribute *a = new D4Attribute(name, attr_str_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_url: {
+ D4Attribute *a = new D4Attribute(name, attr_url_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ case Attr_other_xml: {
+ D4Attribute *a = new D4Attribute(name, attr_otherxml_c);
+ a->add_value_vector(*at.get_attr_vector(i));
+ add_attribute_nocopy(a);
+ break;
+ }
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Unknown DAP2 attribute type in D4Attributes::copy_from_dap2()");
+ }
+ }
+}
+
+
+AttrType get_dap2_AttrType(D4AttributeType d4_type){
+ switch (d4_type) {
+ case attr_container_c: { return Attr_container; }
+ case attr_byte_c: { return Attr_byte; }
+ case attr_int16_c: { return Attr_int16; }
+ case attr_uint16_c: { return Attr_uint16; }
+ case attr_int32_c: { return Attr_int32; }
+ case attr_uint32_c: { return Attr_uint32; }
+ case attr_float32_c: { return Attr_float32; }
+ case attr_float64_c: { return Attr_float64; }
+ case attr_str_c: { return Attr_string; }
+ case attr_url_c: { return Attr_url; }
+ case attr_otherxml_c: { return Attr_other_xml; }
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Unknown DAP4 attribute");
+ }
}
+
+void
+D4Attributes::load_AttrTable(AttrTable *d2_attr_table, D4Attributes *d4_attrs)
+{
+ // cerr << __func__ << "() - Loading attribute table: '" << d2_attr_table->get_name() << "' addr: " << (void *)d2_attr_table << endl;
+
+ // for every attribute in at, copy it to this.
+ for ( D4Attributes::D4AttributesIter i = d4_attrs->attribute_begin(), e = d4_attrs->attribute_end(); i != e; ++i) {
+ string name = (*i)->name();
+ D4AttributeType d4_attr_type = (*i)->type();
+ AttrType d2_attr_type = get_dap2_AttrType(d4_attr_type);
+ string d2_attr_type_name = AttrType_to_String(d2_attr_type);
+
+ D4Attribute::D4AttributeIter vitr =(*i)->value_begin();
+ D4Attribute::D4AttributeIter end =(*i)->value_end();
+
+ vector<string> values;
+ for(;vitr!=end; vitr++){
+ values.push_back((*vitr));
+ }
+
+ switch (d4_attr_type) {
+ case attr_container_c: {
+ // Attr_container
+ AttrTable *child_attr_table = new AttrTable();
+ child_attr_table->set_name(name);
+ // cerr << __func__ << "() - Created child attribute table: " << name << " addr: " << (void *)child_attr_table << endl;
+ load_AttrTable(child_attr_table,(*i)->attributes());
+ d2_attr_table->append_container(child_attr_table,name);
+ break;
+ }
+ default:{
+ // cerr << __func__ << "() - "<< name << " has " << values.size() << " value(s). d2_attr_type_name: " << d2_attr_type_name << endl;
+ d2_attr_table->append_attr(name,d2_attr_type_name, &values);
+ break;
+ }
+ }
+ }
+}
+
+
+/** @brief copy attributes from DAP4 to DAP2
+ *
+ * Given a DAP4 AttrTable, copy all of its attributes into a DAP4 D4Attributes
+ * object.
+ *
+ * @param at Read the DAP2 attributes from here.
+ */
+AttrTable *D4Attributes::get_AttrTable(const string name)
+{
+ AttrTable *my_pretty_pony = new AttrTable();
+ load_AttrTable(my_pretty_pony, this);
+ my_pretty_pony->set_name(name);
+ return my_pretty_pony;
+}
+
+
D4Attribute *
D4Attributes::find_depth_first(const string &name, D4AttributesIter i)
{
@@ -342,35 +419,35 @@ D4Attribute::print_dap4(XMLWriter &xml) const
throw InternalErr(__FILE__, __LINE__, "Could not write attribute for type");
switch (type()) {
- case attr_container_c:
- if (!d_attributes)
- throw InternalErr(__FILE__, __LINE__, "Null Attribute container");
- d_attributes->print_dap4(xml);
- break;
-
- case attr_otherxml_c:
- if (num_values() != 1)
- throw Error("OtherXML attributes cannot be vector-valued.");
- if (xmlTextWriterWriteRaw(xml.get_writer(), (const xmlChar*) value(0).c_str()) < 0)
- throw InternalErr(__FILE__, __LINE__, "Could not write OtherXML value");
- break;
-
- default: {
- // Assume only valid types make it into instances
- D4AttributeCIter i = d_values.begin();//value_begin();
- while (i != d_values.end()) {
- if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Value") < 0)
- throw InternalErr(__FILE__, __LINE__, "Could not write value element");
-
- if (xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) (*i++).c_str()) < 0)
- throw InternalErr(__FILE__, __LINE__, "Could not write attribute value");
-
- if (xmlTextWriterEndElement(xml.get_writer()) < 0)
- throw InternalErr(__FILE__, __LINE__, "Could not end value element");
- }
-
- break;
+ case attr_container_c:
+ if (!d_attributes)
+ throw InternalErr(__FILE__, __LINE__, "Null Attribute container");
+ d_attributes->print_dap4(xml);
+ break;
+
+ case attr_otherxml_c:
+ if (num_values() != 1)
+ throw Error("OtherXML attributes cannot be vector-valued.");
+ if (xmlTextWriterWriteRaw(xml.get_writer(), (const xmlChar*) value(0).c_str()) < 0)
+ throw InternalErr(__FILE__, __LINE__, "Could not write OtherXML value");
+ break;
+
+ default: {
+ // Assume only valid types make it into instances
+ D4AttributeCIter i = d_values.begin();//value_begin();
+ while (i != d_values.end()) {
+ if (xmlTextWriterStartElement(xml.get_writer(), (const xmlChar*) "Value") < 0)
+ throw InternalErr(__FILE__, __LINE__, "Could not write value element");
+
+ if (xmlTextWriterWriteString(xml.get_writer(), (const xmlChar*) (*i++).c_str()) < 0)
+ throw InternalErr(__FILE__, __LINE__, "Could not write attribute value");
+
+ if (xmlTextWriterEndElement(xml.get_writer()) < 0)
+ throw InternalErr(__FILE__, __LINE__, "Could not end value element");
}
+
+ break;
+ }
}
if (xmlTextWriterEndElement(xml.get_writer()) < 0)
diff --git a/D4Attributes.h b/D4Attributes.h
index d952c75..a543eb6 100644
--- a/D4Attributes.h
+++ b/D4Attributes.h
@@ -130,6 +130,9 @@ public:
void transform_to_dap4(AttrTable &at);
+ AttrTable *get_AttrTable(const std::string name);
+ static void load_AttrTable(AttrTable *d2_attr_table, D4Attributes *d4_attrs);
+
bool empty() const { return d_attrs.empty(); }
void add_attribute(D4Attribute *attr) {
diff --git a/D4BaseTypeFactory.cc b/D4BaseTypeFactory.cc
index 8e29232..c4f8b6b 100644
--- a/D4BaseTypeFactory.cc
+++ b/D4BaseTypeFactory.cc
@@ -124,7 +124,9 @@ BaseType *D4BaseTypeFactory::NewVariable(Type t, const string &name) const
Byte *
D4BaseTypeFactory::NewByte(const string &n) const
{
- return new Byte(n);
+ Byte *b = new Byte(n);
+ b->set_is_dap4(true);
+ return b;
}
// Use the type constants specific to Char and UInt8 so the print reps will
@@ -134,6 +136,7 @@ D4BaseTypeFactory::NewChar(const string &n) const
{
Byte *b = new Byte(n);
b->set_type(dods_char_c);
+ b->set_is_dap4(true);
return b;
}
@@ -142,63 +145,82 @@ D4BaseTypeFactory::NewUInt8(const string &n) const
{
Byte *b = new Byte(n);
b->set_type(dods_uint8_c);
+ b->set_is_dap4(true);
return b;
}
Int8 *
D4BaseTypeFactory::NewInt8(const string &n) const
{
- return new Int8(n);
+ Int8 *b = new Int8(n);
+ b->set_is_dap4(true);
+ return b;
}
Int16 *
D4BaseTypeFactory::NewInt16(const string &n) const
{
- return new Int16(n);
+ Int16 *b = new Int16(n);
+ b->set_is_dap4(true);
+ return b;
}
UInt16 *
D4BaseTypeFactory::NewUInt16(const string &n) const
{
- return new UInt16(n);
+ UInt16 *b = new UInt16(n);
+ b->set_is_dap4(true);
+ return b;
}
Int32 *
D4BaseTypeFactory::NewInt32(const string &n) const
{
DBG(cerr << "Inside DAP4BaseTypeFactory::NewInt32" << endl);
- return new Int32(n);
+ Int32 *b = new Int32(n);
+ b->set_is_dap4(true);
+ return b;
}
UInt32 *
D4BaseTypeFactory::NewUInt32(const string &n) const
{
- return new UInt32(n);
+ UInt32 *b = new UInt32(n);
+ b->set_is_dap4(true);
+ return b;
}
Int64 *
D4BaseTypeFactory::NewInt64(const string &n) const
{
DBG(cerr << "Inside DAP4BaseTypeFactory::NewInt64" << endl);
- return new Int64(n);
+ Int64 *b = new Int64(n);
+ b->set_is_dap4(true);
+ return b;
}
UInt64 *
D4BaseTypeFactory::NewUInt64(const string &n) const
{
- return new UInt64(n);
+ UInt64 *b = new UInt64(n);
+ b->set_is_dap4(true);
+ return b;
}
Float32 *
D4BaseTypeFactory::NewFloat32(const string &n) const
{
- return new Float32(n);
+ Float32 *b = new Float32(n);
+ b->set_is_dap4(true);
+ return b;
}
Float64 *
D4BaseTypeFactory::NewFloat64(const string &n) const
{
- return new Float64(n);
+ Float64 *b = new Float64(n);
+ b->set_is_dap4(true);
+ return b;
}
/**
@@ -218,13 +240,17 @@ D4BaseTypeFactory::NewEnum(const string &name, Type type) const
Str *
D4BaseTypeFactory::NewStr(const string &n) const
{
- return new Str(n);
+ Str *b = new Str(n);
+ b->set_is_dap4(true);
+ return b;
}
Url *
D4BaseTypeFactory::NewUrl(const string &n) const
{
- return new Url(n);
+ Url *b = new Url(n);
+ b->set_is_dap4(true);
+ return b;
}
D4Opaque *
@@ -238,7 +264,9 @@ D4BaseTypeFactory::NewOpaque(const string &n) const
Url *
D4BaseTypeFactory::NewURL(const string &n) const
{
- return new Url(n);
+ Url *b = new Url(n);
+ b->set_is_dap4(true);
+ return b;
}
Array *
@@ -250,7 +278,9 @@ D4BaseTypeFactory::NewArray(const string &n, BaseType *v) const
Structure *
D4BaseTypeFactory::NewStructure(const string &n) const
{
- return new Structure(n);
+ Structure *b = new Structure(n);
+ b->set_is_dap4(true);
+ return b;
}
D4Sequence *
diff --git a/D4Enum.cc b/D4Enum.cc
index 36d0688..1a8165b 100644
--- a/D4Enum.cc
+++ b/D4Enum.cc
@@ -25,7 +25,7 @@
#include "config.h"
-//#define DODS_DEBUG 1
+// #define DODS_DEBUG
#include <cassert>
#include <sstream>
@@ -38,6 +38,8 @@
#include "UInt16.h"
#include "Int32.h"
#include "UInt32.h"
+#include "Int64.h"
+#include "UInt64.h"
#include "D4Group.h"
#include "D4Enum.h"
@@ -76,6 +78,144 @@ void D4Enum::m_duplicate(const D4Enum &src)
d_is_signed = src.d_is_signed;
}
+
+/**
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+std::vector<BaseType *> *
+D4Enum::transform_to_dap2(AttrTable *){
+ BaseType *my_pretty_pony;
+
+ DBG(cerr << __func__ << "() - BEGIN" << endl;);
+
+
+ switch (d_element_type) {
+ case dods_byte_c:
+ case dods_int8_c:
+ case dods_uint8_c:
+ {
+ Byte *var = new Byte(name());
+ dods_byte val;
+ this->value(&val);
+ var->set_value(val);
+ my_pretty_pony = var;
+ break;
+ }
+ case dods_uint16_c:
+ {
+ UInt16 *var = new UInt16(name());
+ dods_uint16 val;
+ this->value(&val);
+ var->set_value(val);
+ my_pretty_pony = var;
+ break;
+ }
+ case dods_uint32_c:
+ {
+ UInt32 *var = new UInt32(name());
+ dods_uint32 val;
+ this->value(&val);
+ var->set_value(val);
+ my_pretty_pony = var;
+ break;
+ }
+ case dods_uint64_c:
+ {
+ UInt64 *var = new UInt64(name());
+ dods_uint64 val;
+ this->value(&val);
+ var->set_value(val);
+ my_pretty_pony = var;
+ break;
+ }
+ case dods_int16_c:
+ {
+ Int16 *var = new Int16(name());
+ dods_int16 val;
+ this->value(&val);
+ var->set_value(val);
+ my_pretty_pony = var;
+ break;
+ }
+ case dods_int32_c:
+ {
+ Int32 *var = new Int32(name());
+ dods_int32 val;
+ this->value(&val);
+ var->set_value(val);
+ my_pretty_pony = var;
+ break;
+ }
+ case dods_int64_c:
+ {
+ Int64 *var = new Int64(name());
+ dods_int64 val;
+ this->value(&val);
+ var->set_value(val);
+ my_pretty_pony = var;
+ break;
+ }
+ default:
+ {
+ ostringstream oss;
+ oss << __func__ << "() - ERROR! Unknown D4Enum type:"<< d_element_type << " name: " << name() << endl;
+ throw InternalErr(__FILE__,__LINE__,oss.str());
+ break;
+ }
+ }
+
+ DBG( cerr << __func__ << "() - Processing Enum type:"<<
+ my_pretty_pony->type_name() << " name: " << my_pretty_pony->name() << endl;);
+ /**
+ * Grab the attributes!
+ */
+ AttrTable d2_attrs = *(this->attributes()->get_AttrTable(name()));
+ my_pretty_pony->set_attr_table(d2_attrs);
+
+ // cerr << "D4Enum::transform_to_dap2() - my_pretty_pony attrs: "<< endl;
+ // my_pretty_pony->get_attr_table().print(cerr);
+
+ /**
+ * Now we make the Enum label, and the enum's definition
+ * into DAP2 attributes for our returned item.
+ */
+ long long my_value;
+ this->value(&my_value);
+ DBG(cerr << __func__ << "() - value: "<< my_value << endl;);
+
+ string my_label="";
+ AttrTable *enum_def = new AttrTable();
+ enum_def->set_name("d4:enum_def");
+
+ D4EnumDef::D4EnumValueIter dIter = d_enum_def->value_begin();
+ D4EnumDef::D4EnumValueIter dEnd = d_enum_def->value_end();
+ while( dIter!=dEnd){
+ long long a_value = (*dIter).value;
+ string a_label = (*dIter).label;
+ ostringstream oss;
+ oss << a_value;
+ DBG(cerr << __func__ << "() - a_value: "<< a_value << endl;);
+ enum_def->append_attr(a_label,my_pretty_pony->type_name(),oss.str());
+ if(a_value == my_value){
+ my_label = (*dIter).label;
+ }
+ dIter++;
+ }
+ if(!my_label.empty())
+ my_pretty_pony->get_attr_table().append_attr("d4:enum_label","String",my_label);
+ my_pretty_pony->get_attr_table().append_container(enum_def,enum_def->get_name());
+
+ vector<BaseType *> *result = new vector<BaseType *>();
+ result->push_back(my_pretty_pony);
+ DBG(cerr << __func__ << "() - END" << endl;);
+ return result;
+}
+
void D4Enum::m_check_value(int64_t v) const
{
switch (d_element_type) {
diff --git a/D4Enum.h b/D4Enum.h
index e5d2517..dd63cc3 100644
--- a/D4Enum.h
+++ b/D4Enum.h
@@ -189,6 +189,9 @@ public:
unsigned int val2buf(void *, bool);
unsigned int buf2val(void **);
+
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
};
} // namespace libdap
diff --git a/D4Group.cc b/D4Group.cc
index 23ffa8c..8013fb6 100644
--- a/D4Group.cc
+++ b/D4Group.cc
@@ -23,7 +23,8 @@
// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
#include "config.h"
-// #define DODS_DEBUG 1
+
+//#define DODS_DEBUG
#include <iostream>
#include <sstream>
@@ -517,7 +518,7 @@ D4Group::serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,
groupsIter g = d_groups.begin();
while (g != d_groups.end())
- (*g++)->serialize(m, dmr, /*eval,*/ filter);
+ (*g++)->serialize(m, dmr, filter);
// Specialize how the top-level variables in any Group are sent; include
// a checksum for them. A subset operation might make an interior set of
@@ -532,7 +533,7 @@ D4Group::serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,
m.reset_checksum();
DBG(cerr << "Serializing variable " << (*i)->type_name() << " " << (*i)->name() << endl);
- (*i)->serialize(m, dmr, /*eval,*/ filter);
+ (*i)->serialize(m, dmr, filter);
DBG(cerr << "Wrote CRC32: " << m.get_checksum() << " for " << (*i)->name() << endl);
m.put_checksum();
@@ -611,4 +612,134 @@ D4Group::print_dap4(XMLWriter &xml, bool constrained)
}
}
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * D4Group objects, with the exception of the root group, "disappear"
+ * into the names of their member variables. Specifically the Group
+ * name is add as a prefix followed by a "/" separator to the names
+ * of all of the Group's member groups variables. The Group attributes
+ * (metadata) are transfered to the parent_attr_table. The Group
+ * members are collected returned in vector.
+ *
+ *
+ * @param The AttrTable pointer parent_attr_table is used by Groups, which disappear
+ * from the DAP2 representation. Their children are returned in the the BAseType vector
+ * their attributes are added to parent_attr_table;
+ * @return A pointer to a vector of BaseType pointers (right?). In this D4Group case the
+ * vector will contain DAP2 versions of all of the member variables of the D4Group instance.
+ * (ex: UInt64) the will return a NULL pointer and so this must be tested!
+ */
+vector<BaseType *> *
+D4Group::transform_to_dap2(AttrTable *parent_attr_table){
+ return transform_to_dap2(parent_attr_table,false);
+}
+vector<BaseType *> *
+D4Group::transform_to_dap2(AttrTable *parent_attr_table, bool is_root)
+{
+ DBG( cerr << __func__ << "() - BEGIN ("<< name() << " is_root: "<< (is_root?"true":"false") << ")" << endl;);
+ vector<BaseType *> *results = new vector<BaseType *>();
+ vector<BaseType *> dropped_vars;
+
+ AttrTable *group_attrs;
+ group_attrs = attributes()->get_AttrTable(name());
+
+ /**
+ * If this is the root group then we handle the attributes differently.
+ */
+ if(is_root){
+ DBG( cerr << __func__ << "() - Promoting group attributes to parent" << endl;);
+ // If it's a root group we copy all the stuff up into the parent attr table
+ for (AttrTable::Attr_iter i = group_attrs->attr_begin(), e = group_attrs->attr_end(); i != e; ++i) {
+ if ((*i)->type == Attr_container) {
+ // copy the source container so that the DAS passed in can be
+ // deleted after calling this method.
+ AttrTable *at = new AttrTable(*(*i)->attributes);
+ parent_attr_table->append_container(at, at->get_name());
+ }
+ else {
+ parent_attr_table->append_attr(
+ (*i)->name,
+ AttrType_to_String((*i)->type),
+ (*i)->attr);
+ }
+ }
+ delete group_attrs;
+ group_attrs = parent_attr_table;
+ }
+
+ /**
+ * Now we process the child variables of this group
+ */
+ for (D4Group::Vars_citer varIter = var_begin(), e = var_end(); varIter != e; ++varIter) {
+ DBG( cerr << __func__ << "() - Processing member variable '" << (*varIter)->name() <<
+ "' root: " << (is_root?"true":"false") << endl;);
+ vector<BaseType *> *new_vars = (*varIter)->transform_to_dap2(group_attrs);
+ if (new_vars) { // Might be un-mappable
+ // It's not so game on..
+ vector<BaseType*>::iterator vIter = new_vars->begin();
+ vector<BaseType*>::iterator end = new_vars->end();
+ for( ; vIter!=end ; vIter++ ){
+ BaseType *new_var = (*vIter);
+
+ string new_name = (is_root?"":FQN()) + new_var->name();
+ new_var->set_name(new_name);
+ results->push_back(new_var);
+ (*vIter) = NULL;
+ DBG( cerr << __func__ << "() - Added member variable '" << (*varIter)->name() << "' " <<
+ "to results vector. root: "<< (is_root?"true":"false") << endl;);
+ }
+ delete new_vars;
+ }
+ else {
+ DBG( cerr << __func__ << "() - Dropping member variable " << (*varIter)->name() <<
+ " root: " << (is_root?"true":"false") << endl;);
+ // Got back a NULL, so we are dropping this var.
+ dropped_vars.push_back(*varIter);
+ }
+ }
+ // Process dropped DAP4 vars
+ DBG( cerr << __func__ << "() - Processing " << dropped_vars.size() << " Dropped Variable(s)" << endl;);
+ AttrTable *dv_attr_table = make_dropped_vars_attr_table(&dropped_vars);
+ if(dv_attr_table){
+ DBG( cerr << __func__ << "() - Adding Dropped Variables AttrTable" << endl;);
+ group_attrs->append_container(dv_attr_table,dv_attr_table->get_name());
+ }
+ else {
+ DBG( cerr << __func__ << "() - No Dropped Variables AttrTable returned." << endl;);
+
+ }
+
+ /**
+ * Get all the child groups.
+ */
+ D4Group::groupsIter gIter = grp_begin();
+ D4Group::groupsIter gEnd = grp_end();
+ for( ; gIter!=gEnd ; gIter++){
+ D4Group *grp = *gIter;
+ DBG( cerr << __func__ << "() - Processing D4Group " << grp->name() << endl;);
+ vector<BaseType *> *d2_vars = grp->transform_to_dap2(group_attrs);
+ if(d2_vars){
+ DBG( cerr << __func__ << "() - Processing " << grp->name() << " Member Variables." << endl;);
+ vector<BaseType *>::iterator vIter = d2_vars->begin();
+ vector<BaseType *>::iterator vEnd = d2_vars->end();
+ for( ; vIter!=vEnd; vIter++){
+ DBG( cerr << __func__ << "() - Processing " << grp->name() << " Member Variable: " << (*vIter)->name() << endl;);
+ results->push_back(*vIter);
+ }
+ }
+
+
+
+ }
+
+ if(!is_root){
+ group_attrs->set_name(name());
+ parent_attr_table->append_container(group_attrs,group_attrs->get_name());
+ }
+ DBG( cerr << __func__ << "() - END" << endl;);
+ return results;
+}
+
+
} /* namespace libdap */
diff --git a/D4Group.h b/D4Group.h
index 42b087f..683afe3 100644
--- a/D4Group.h
+++ b/D4Group.h
@@ -139,6 +139,10 @@ public:
virtual void deserialize(D4StreamUnMarshaller &um, DMR &dmr);
void print_dap4(XMLWriter &xml, bool constrained = false);
+
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table, bool use_name_prefix);
+
};
} /* namespace libdap */
diff --git a/D4Opaque.cc b/D4Opaque.cc
index 22d80dd..dd53b5a 100644
--- a/D4Opaque.cc
+++ b/D4Opaque.cc
@@ -22,6 +22,7 @@
//
// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+//#define DODS_DEBUG
#include "config.h"
@@ -143,6 +144,13 @@ D4Opaque::value() const
return d_buf;
}
+std::vector<BaseType *> *
+D4Opaque::transform_to_dap2(AttrTable *){
+ DBG(cerr << __func__ << "() - Transform not implemented DAP4 Opaque type." << endl;);
+ return NULL;
+}
+
+
void
D4Opaque::print_val(ostream &out, string space, bool print_decl_p)
{
diff --git a/D4Opaque.h b/D4Opaque.h
index 8eea695..008fc3e 100644
--- a/D4Opaque.h
+++ b/D4Opaque.h
@@ -98,7 +98,10 @@ public:
throw InternalErr(__FILE__, __LINE__, "Unimplemented method");
}
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
+
virtual void dump(std::ostream &strm) const ;
+
};
} // namespace libdap
diff --git a/D4ParserSax2.cc b/D4ParserSax2.cc
index c838e78..b62b2f3 100644
--- a/D4ParserSax2.cc
+++ b/D4ParserSax2.cc
@@ -51,7 +51,6 @@
#include "util.h"
#include "debug.h"
-
namespace libdap {
static const char *states[] = {
@@ -591,7 +590,7 @@ void D4ParserSax2::process_variable_helper(Type t, ParseState s, const xmlChar *
void D4ParserSax2::dmr_start_document(void * p)
{
D4ParserSax2 *parser = static_cast<D4ParserSax2*>(p);
- parser->error_msg = "";
+ parser->d_error_msg = "";
parser->char_data = "";
// Set this in intern_helper so that the loop test for the parser_end
@@ -654,7 +653,7 @@ void D4ParserSax2::dmr_start_element(void *p, const xmlChar *l, const xmlChar *p
string dap4_ns_name = DapXmlNamspaces::getDapNamespaceString(DAP_4_0);
if (parser->debug()) cerr << "dap4_ns_name: " << dap4_ns_name << endl;
- string this_element_ns_name((char *)URI);
+ string this_element_ns_name = (URI != 0) ? ((char *)URI) : "";
if (parser->debug()) cerr << "this_element_ns_name: " << this_element_ns_name << endl;
if(this_element_ns_name.compare(dap4_ns_name)){
@@ -1206,10 +1205,10 @@ void D4ParserSax2::dmr_fatal_error(void * p, const char *msg, ...)
vsnprintf(str, 1024, msg, args);
va_end(args);
- int line = xmlSAX2GetLineNumber(parser->context);
+ int line = xmlSAX2GetLineNumber(parser->d_context);
- if (!parser->error_msg.empty()) parser->error_msg += "\n";
- parser->error_msg += "At line " + long_to_string(line) + ": " + string(str);
+ if (!parser->d_error_msg.empty()) parser->d_error_msg += "\n";
+ parser->d_error_msg += "At line " + long_to_string(line) + ": " + string(str);
}
void D4ParserSax2::dmr_error(void *p, const char *msg, ...)
@@ -1224,10 +1223,10 @@ void D4ParserSax2::dmr_error(void *p, const char *msg, ...)
vsnprintf(str, 1024, msg, args);
va_end(args);
- int line = xmlSAX2GetLineNumber(parser->context);
+ int line = xmlSAX2GetLineNumber(parser->d_context);
- if (!parser->error_msg.empty()) parser->error_msg += "\n";
- parser->error_msg += "At line " + long_to_string(line) + ": " + string(str);
+ if (!parser->d_error_msg.empty()) parser->d_error_msg += "\n";
+ parser->d_error_msg += "At line " + long_to_string(line) + ": " + string(str);
}
//@}
@@ -1236,11 +1235,11 @@ void D4ParserSax2::dmr_error(void *p, const char *msg, ...)
*/
void D4ParserSax2::cleanup_parse()
{
- bool wellFormed = context->wellFormed;
- bool valid = context->valid;
+ bool wellFormed = d_context->wellFormed;
+ bool valid = d_context->valid;
- context->sax = NULL;
- xmlFreeParserCtxt(context);
+ d_context->sax = NULL;
+ xmlFreeParserCtxt(d_context);
delete d_enum_def;
d_enum_def = 0;
@@ -1256,13 +1255,13 @@ void D4ParserSax2::cleanup_parse()
}
if (!wellFormed)
- throw Error("The DMR was not well formed. " + error_msg);
+ throw Error("The DMR was not well formed. " + d_error_msg);
else if (!valid)
- throw Error("The DMR was not valid." + error_msg);
+ throw Error("The DMR was not valid." + d_error_msg);
else if (get_state() == parser_error)
- throw Error(error_msg);
+ throw Error(d_error_msg);
else if (get_state() == parser_fatal_error)
- throw InternalErr(error_msg);
+ throw InternalErr(d_error_msg);
}
/**
@@ -1292,6 +1291,8 @@ void D4ParserSax2::intern(istream &f, DMR *dest_dmr, bool debug)
d_dmr = dest_dmr; // dump values here
+#if 0
+ // Old, bad, code. Lines are limited to 1023 chars including the element text.
const int size = 1024;
char chars[size];
int line = 1;
@@ -1300,21 +1301,56 @@ void D4ParserSax2::intern(istream &f, DMR *dest_dmr, bool debug)
int res = f.gcount();
if (res == 0) throw Error("No input found while parsing the DMR.");
+ getline(f, line);
+
if (debug) cerr << "line: (" << line++ << "): " << chars << endl;
- context = xmlCreatePushParserCtxt(&ddx_sax_parser, this, chars, res - 1, "stream");
- context->validate = true;
+ d_context = xmlCreatePushParserCtxt(&d_dmr_sax_parser, this, chars, res - 1, "stream");
+ d_context->validate = true;
push_state(parser_start);
f.getline(chars, size);
while ((f.gcount() > 0) && (get_state() != parser_end)) {
if (debug) cerr << "line: (" << line++ << "): " << chars << endl;
- xmlParseChunk(context, chars, f.gcount() - 1, 0);
+ xmlParseChunk(d_context, chars, f.gcount() - 1, 0);
f.getline(chars, size);
}
// This call ends the parse.
- xmlParseChunk(context, chars, 0, 1/*terminate*/);
+ xmlParseChunk(d_context, chars, 0, 1/*terminate*/);
+#else
+ int line_num = 1;
+ string line;
+
+ // Get the <xml ... ?> line
+ getline(f, line);
+ if (line.length() == 0) throw Error("No input found while parsing the DMR.");
+
+ if (debug) cerr << "line: (" << line_num << "): " << endl << line << endl << endl;
+
+ d_context = xmlCreatePushParserCtxt(&d_dmr_sax_parser, this, line.c_str(), line.length(), "stream");
+ d_context->validate = true;
+ push_state(parser_start);
+
+ // Get the first line of stuff
+ getline(f, line);
+ ++line_num;
+
+ if (debug) cerr << "line: (" << line_num << "): " << endl << line << endl << endl;
+
+ while (!f.eof() && (get_state() != parser_end)) {
+ xmlParseChunk(d_context, line.c_str(), line.length(), 0);
+
+ // Get the next line
+ getline(f, line);
+ ++line_num;
+
+ if (debug) cerr << "line: (" << line_num << "): " << endl << line << endl << endl;
+ }
+
+ // This call ends the parse.
+ xmlParseChunk(d_context, line.c_str(), 0, 1/*terminate*/);
+#endif
// This checks that the state on the parser stack is parser_end and throws
// an exception if it's not (i.e., the loop exited with gcount() == 0).
@@ -1358,13 +1394,11 @@ void D4ParserSax2::intern(const char *buffer, int size, DMR *dest_dmr, bool debu
d_dmr = dest_dmr; // dump values in dest_dmr
push_state(parser_start);
- context = xmlCreatePushParserCtxt(&ddx_sax_parser, this, buffer, size, "stream");
- context->validate = true;
- //push_state(parser_start);
- //xmlParseChunk(context, buffer, size, 0);
+ d_context = xmlCreatePushParserCtxt(&d_dmr_sax_parser, this, buffer, size, "stream");
+ d_context->validate = true;
// This call ends the parse.
- xmlParseChunk(context, buffer, 0, 1/*terminate*/);
+ xmlParseChunk(d_context, buffer, 0, 1/*terminate*/);
// This checks that the state on the parser stack is parser_end and throws
// an exception if it's not (i.e., the loop exited with gcount() == 0).
diff --git a/D4ParserSax2.h b/D4ParserSax2.h
index 2b34b22..d160b11 100644
--- a/D4ParserSax2.h
+++ b/D4ParserSax2.h
@@ -117,7 +117,7 @@ private:
parser_end
};
- xmlSAXHandler ddx_sax_parser;
+ xmlSAXHandler d_dmr_sax_parser;
// The results of the parse operation are stored in these fields.
// This is passed into the parser using the intern() methods.
@@ -166,8 +166,8 @@ private:
unsigned int unknown_depth;
// These are used for processing errors.
- string error_msg; // Error message(s), if any.
- xmlParserCtxtPtr context; // used for error message line numbers
+ string d_error_msg; // Error message(s), if any.
+ xmlParserCtxtPtr d_context; // used for error message line numbers
// These hold temporary values read during the parse.
string dods_attr_name; // DAP4 attributes, not XML attributes
@@ -257,25 +257,25 @@ public:
D4ParserSax2() :
d_dmr(0), d_enum_def(0), d_dim_def(0),
other_xml(""), other_xml_depth(0), unknown_depth(0),
- error_msg(""), context(0),
+ d_error_msg(""), d_context(0),
dods_attr_name(""), dods_attr_type(""),
char_data(""), root_ns(""), d_debug(false), d_strict(true)
{
//xmlSAXHandler ddx_sax_parser;
- memset(&ddx_sax_parser, 0, sizeof(xmlSAXHandler));
-
- ddx_sax_parser.getEntity = &D4ParserSax2::dmr_get_entity;
- ddx_sax_parser.startDocument = &D4ParserSax2::dmr_start_document;
- ddx_sax_parser.endDocument = &D4ParserSax2::dmr_end_document;
- ddx_sax_parser.characters = &D4ParserSax2::dmr_get_characters;
- ddx_sax_parser.ignorableWhitespace = &D4ParserSax2::dmr_ignoreable_whitespace;
- ddx_sax_parser.cdataBlock = &D4ParserSax2::dmr_get_cdata;
- ddx_sax_parser.warning = &D4ParserSax2::dmr_error;
- ddx_sax_parser.error = &D4ParserSax2::dmr_error;
- ddx_sax_parser.fatalError = &D4ParserSax2::dmr_fatal_error;
- ddx_sax_parser.initialized = XML_SAX2_MAGIC;
- ddx_sax_parser.startElementNs = &D4ParserSax2::dmr_start_element;
- ddx_sax_parser.endElementNs = &D4ParserSax2::dmr_end_element;
+ memset(&d_dmr_sax_parser, 0, sizeof(xmlSAXHandler));
+
+ d_dmr_sax_parser.getEntity = &D4ParserSax2::dmr_get_entity;
+ d_dmr_sax_parser.startDocument = &D4ParserSax2::dmr_start_document;
+ d_dmr_sax_parser.endDocument = &D4ParserSax2::dmr_end_document;
+ d_dmr_sax_parser.characters = &D4ParserSax2::dmr_get_characters;
+ d_dmr_sax_parser.ignorableWhitespace = &D4ParserSax2::dmr_ignoreable_whitespace;
+ d_dmr_sax_parser.cdataBlock = &D4ParserSax2::dmr_get_cdata;
+ d_dmr_sax_parser.warning = &D4ParserSax2::dmr_error;
+ d_dmr_sax_parser.error = &D4ParserSax2::dmr_error;
+ d_dmr_sax_parser.fatalError = &D4ParserSax2::dmr_fatal_error;
+ d_dmr_sax_parser.initialized = XML_SAX2_MAGIC;
+ d_dmr_sax_parser.startElementNs = &D4ParserSax2::dmr_start_element;
+ d_dmr_sax_parser.endElementNs = &D4ParserSax2::dmr_end_element;
}
void intern(istream &f, DMR *dest_dmr, bool debug = false);
diff --git a/DDS.cc b/DDS.cc
index cbe577c..e3607e0 100644
--- a/DDS.cc
+++ b/DDS.cc
@@ -51,7 +51,7 @@
#include <algorithm>
#include <functional>
-//#define DODS_DEBUG
+// #define DODS_DEBUG
//#define DODS_DEBUG2
#include "GNURegex.h"
@@ -739,17 +739,17 @@ DDS::leaf_match(const string &n, BaseType::btp_stack *s)
for (Vars_iter i = vars.begin(); i != vars.end(); i++) {
BaseType *btp = *i;
- DBG(cerr << "DDS::leaf_match: Looking for " << n << " in: " << btp->d_name() << endl);
+ DBG(cerr << "DDS::leaf_match: Looking for " << n << " in: " << btp->name() << endl);
// Look for the d_name in the dataset's top-level
if (btp->name() == n) {
- DBG(cerr << "Found " << n << " in: " << btp->d_name() << endl);
+ DBG(cerr << "Found " << n << " in: " << btp->name() << endl);
return btp;
}
if (btp->is_constructor_type()) {
BaseType *found = btp->var(n, false, s);
if (found) {
- DBG(cerr << "Found " << n << " in: " << btp->d_name() << endl);
+ DBG(cerr << "Found " << n << " in: " << btp->name() << endl);
return found;
}
}
@@ -1057,17 +1057,36 @@ DDS::print(ostream &out)
*
* @param out Write the DAS here.
*/
+static string four_spaces = " ";
+void print_var_das(ostream &out, BaseType *bt, string indent=""){
+
+ AttrTable attr_table = bt->get_attr_table();
+ out << indent << add_space_encoding(bt->name()) << " {" << endl;
+ attr_table.print(out, indent+four_spaces);
+ Constructor *cnstrctr = dynamic_cast < Constructor * >(bt);
+ if(cnstrctr) {
+ Constructor::Vars_iter i = cnstrctr->var_begin();
+ Constructor::Vars_iter e = cnstrctr->var_end();
+ for (; i!=e; i++) {
+ print_var_das(out,*i,indent+four_spaces);
+ }
+
+ }
+ out << indent << "}" << endl;
+
+}
+
void
DDS::print_das(ostream &out)
{
- out << "Attributes {\n" ;
-
- d_attr.print(out, " ");
+ string indent(" ");
+ out << "Attributes {" << endl ;
for (Vars_citer i = vars.begin(); i != vars.end(); i++) {
- (*i)->get_attr_table().print(out, " ");
+ print_var_das(out, *i, four_spaces);
}
-
- out << "}\n" ;
+ // Print the global attributes at the end.
+ d_attr.print(out,indent);
+ out << "}" << endl ;
}
/** @brief Print a constrained DDS to the specified file.
@@ -1076,7 +1095,7 @@ DDS::print_das(ostream &out)
are marked to be sent after evaluating the constraint
expression.
- \note This function only works for scalars at the top level.
+ @note This function only works for scalars at the top level.
@returns true.
*/
diff --git a/DMR.cc b/DMR.cc
index d701867..1d4e09e 100644
--- a/DMR.cc
+++ b/DMR.cc
@@ -44,6 +44,7 @@
#include "D4Group.h"
#include "BaseType.h"
#include "Array.h"
+#include "Grid.h"
#include "DMR.h"
#include "XMLWriter.h"
#include "D4BaseTypeFactory.h"
@@ -223,22 +224,138 @@ DMR::operator=(const DMR &rhs)
*/
void DMR::build_using_dds(DDS &dds)
{
- set_name(dds.get_dataset_name());
- set_filename(dds.filename());
-
- for (DDS::Vars_iter i = dds.var_begin(), e = dds.var_end(); i != e; ++i) {
- BaseType *new_var = (*i)->transform_to_dap4(root() /*group*/, root() /*container*/);
- // If the variable being transformed is a Grid,
- // then Grid::transform_to_dap4() will add all the arrays to the
- // container (root() in this case) and return null, indicating that
- // this code does not need to do anything to add the transformed variable.
- if (new_var) root()->add_var_nocopy(new_var);
- }
-
- // Now copy the global attributes
- root()->attributes()->transform_to_dap4(dds.get_attr_table());
+ set_name(dds.get_dataset_name());
+ set_filename(dds.filename());
+
+ D4Group *root_grp = root();
+ for (DDS::Vars_iter i = dds.var_begin(), e = dds.var_end(); i != e; ++i) {
+ BaseType *d4_var = root()->var((*i)->name());
+ // Don't add duplicate variables. We have to make this check
+ // because some of the child variables may add arrays
+ // to the root object. For example, this happens in
+ // Grid with the Map Arrays - ndp - 05/08/17
+ if(!d4_var){
+ // no variable of this name is in the root group at this point. Add it.
+ DBG(cerr << __func__ << "() - Transforming top level variable: " <<
+ " (" << (*i)->type_name() << ":'" << (*i)->name() << "':"<<(void *)(*i) <<
+ ") (root:"<< root_grp << ")"<< endl; );
+ (*i)->transform_to_dap4(root_grp, root_grp);
+ DBG(cerr << __func__ << "() - top level variable: '" <<
+ (*i)->name() << "' (type:" << (*i)->type_name() << ") Transformed"<< endl; );
+ }
+ else {
+ DBG(cerr << __func__ << "() - Skipping variable: " <<
+ d4_var->type_name() << " " << d4_var->name() << " because a variable with" <<
+ " this name already exists in the root group." << endl; );
+ }
+ }
+
+ // Now copy the global attributes
+ root()->attributes()->transform_to_dap4(dds.get_attr_table());
+}
+#if 1
+/**
+ * If we have a DMR that includes Attributes, use it to build the DDS. This
+ * will copy all of the variables in the DMR into the DDS using
+ * BaseType::transform_to_dap2(), so the actual types added can be
+ * controlled by code that specializes the various type classes.
+ *
+ * @param dds Read variables and Attributes from this DDS
+ */
+DDS *DMR::getDDS(DMR &dmr)
+{
+ DBG( cerr << __func__ << "() - BEGIN" << endl;);
+ D4Group *root = dmr.root();
+
+ BaseTypeFactory *btf = new BaseTypeFactory();
+ DDS *dds = new DDS(btf,dmr.name());
+ dds->filename(dmr.filename());
+ AttrTable *dds_at = &(dds->get_attr_table());
+
+ // Now copy the global attributes
+ // D4Attributes::load_AttrTable(dds_at,root->attributes());
+
+ vector<BaseType *> *top_vars = root->transform_to_dap2(dds_at,true);
+
+ vector<BaseType *>::iterator vIter = top_vars->begin();
+ vector<BaseType *>::iterator vEnd = top_vars->end();
+ for( ; vIter!=vEnd ; vIter++){
+ dds->add_var(*vIter);
+ }
+
+#if 0
+ set<string> shared_dim_candidates;
+
+ vector<BaseType *> dropped_vars;
+ for (D4Group::Vars_iter i = root->var_begin(), e = root->var_end(); i != e; ++i)
+ {
+ DBG( cerr << __func__ << "() - Processing top level variable '"<< (*i)->type_name() << " " << (*i)->name() << "' to DDS." << endl; );
+ vector<BaseType *> *new_vars = (*i)->transform_to_dap2(&(dds->get_attr_table()));
+ if(new_vars!=0){
+ vector<BaseType*>::iterator vIter = new_vars->begin();
+ vector<BaseType*>::iterator end = new_vars->end();
+ for( ; vIter!=end ; vIter++ ){
+ BaseType *new_var = (*vIter);
+ DBG( cerr << __func__ << "() - Adding variable name: '"<< new_var->name() << "' " <<
+ "type: " << new_var->type() << " " <<
+ "type_name: " << new_var->type_name() << " to DDS." << endl; );
+ dds->add_var_nocopy(new_var);
+ Grid *grid = dynamic_cast <Grid *>(new_var);
+ if(grid){
+ Grid::Map_iter m = grid->map_begin();
+ for( ; m != grid->map_end() ; m++){
+ shared_dim_candidates.insert((*m)->name());
+ }
+ }
+ (*vIter) = 0;
+ }
+ delete new_vars;
+ }
+ else {
+ DBG( cerr << __func__ << "Adding variable '"<< (*i)->type_name() << " " << (*i)->name() << "' to drop list." << endl; );
+ dropped_vars.push_back((*i));
+ }
+ }
+ AttrTable *dv_table = Constructor::make_dropped_vars_attr_table(&dropped_vars);
+ if(dv_table){
+ DBG( cerr << __func__ << "() - Adding dropped variable AttrTable." << endl;);
+ dds_at->append_container(dv_table,dv_table->get_name());
+ }
+
+ // Get all the child groups.
+ D4Group::groupsIter gIter = root->grp_begin();
+ D4Group::groupsIter gEnd = root->grp_end();
+ for( ; gIter!=gEnd ; gIter++){
+ D4Group *grp = *gIter;
+ DBG( cerr << __func__ << "() - Processing D4Group " << grp->name() << endl;);
+ vector<BaseType *> *d2_vars = grp->transform_to_dap2(dds_at);
+ if(d2_vars){
+ DBG( cerr << __func__ << "() - Processing " << grp->name() << " Member Variables." << endl;);
+ vector<BaseType *>::iterator vIter = d2_vars->begin();
+ vector<BaseType *>::iterator vEnd = d2_vars->end();
+ for( ; vIter!=vEnd; vIter++){
+ DBG( cerr << __func__ << "() - Processing " << grp->name() << " Member Variable: " << (*vIter)->name() << endl;);
+ dds->add_var(*vIter);
+ }
+ }
+ }
+#endif
+
+
+ DBG( cerr << __func__ << "() - END" << endl;);
+ return dds;
+}
+
+
+DDS *DMR::getDDS()
+{
+ return DMR::getDDS(*this);
}
+
+
+#endif
+
D4Group *
DMR::root()
{
diff --git a/DMR.h b/DMR.h
index a5ae1fb..08c30f7 100644
--- a/DMR.h
+++ b/DMR.h
@@ -175,6 +175,12 @@ public:
*/
D4Group *root();
+ static DDS *getDDS(DMR &dmr);
+ virtual DDS *getDDS();
+
+
+
+
void print_dap4(XMLWriter &xml, bool constrained = false);
virtual void dump(ostream &strm) const ;
diff --git a/Error.tab.cc b/Error.tab.cc
index 4e39786..8c8d76d 100644
--- a/Error.tab.cc
+++ b/Error.tab.cc
@@ -1259,56 +1259,56 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 103 "Error.yy" /* yacc.c:1646 */
+#line 103 "Error.yy" /* yacc.c:1661 */
{ (yyval.boolean) = (yyvsp[-2].boolean); STATUS(arg) = (yyvsp[-2].boolean); }
-#line 1265 "Error.tab.cc" /* yacc.c:1646 */
+#line 1265 "Error.tab.cc" /* yacc.c:1661 */
break;
case 3:
-#line 106 "Error.yy" /* yacc.c:1646 */
+#line 106 "Error.yy" /* yacc.c:1661 */
{ (yyval.boolean) = (yyvsp[0].boolean); }
-#line 1271 "Error.tab.cc" /* yacc.c:1646 */
+#line 1271 "Error.tab.cc" /* yacc.c:1661 */
break;
case 4:
-#line 109 "Error.yy" /* yacc.c:1646 */
+#line 109 "Error.yy" /* yacc.c:1661 */
{ (yyval.boolean) = (yyvsp[-1].boolean) && (yyvsp[0].boolean); }
-#line 1277 "Error.tab.cc" /* yacc.c:1646 */
+#line 1277 "Error.tab.cc" /* yacc.c:1661 */
break;
case 5:
-#line 110 "Error.yy" /* yacc.c:1646 */
+#line 110 "Error.yy" /* yacc.c:1661 */
{ (yyval.boolean) = (yyvsp[0].boolean); }
-#line 1283 "Error.tab.cc" /* yacc.c:1646 */
+#line 1283 "Error.tab.cc" /* yacc.c:1661 */
break;
case 6:
-#line 114 "Error.yy" /* yacc.c:1646 */
+#line 114 "Error.yy" /* yacc.c:1661 */
{
ERROR_OBJ(arg)->set_error_code((ErrorCode)(yyvsp[-1].integer));
(yyval.boolean) = true;
}
-#line 1292 "Error.tab.cc" /* yacc.c:1646 */
+#line 1292 "Error.tab.cc" /* yacc.c:1661 */
break;
case 7:
-#line 121 "Error.yy" /* yacc.c:1646 */
+#line 121 "Error.yy" /* yacc.c:1661 */
{
ERROR_OBJ(arg)->set_error_message((yyvsp[0].string));
}
-#line 1300 "Error.tab.cc" /* yacc.c:1646 */
+#line 1300 "Error.tab.cc" /* yacc.c:1661 */
break;
case 8:
-#line 125 "Error.yy" /* yacc.c:1646 */
+#line 125 "Error.yy" /* yacc.c:1661 */
{
(yyval.boolean) = true;
}
-#line 1308 "Error.tab.cc" /* yacc.c:1646 */
+#line 1308 "Error.tab.cc" /* yacc.c:1661 */
break;
-#line 1312 "Error.tab.cc" /* yacc.c:1646 */
+#line 1312 "Error.tab.cc" /* yacc.c:1661 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/Error.tab.hh b/Error.tab.hh
index 8757ad7..a0b0432 100644
--- a/Error.tab.hh
+++ b/Error.tab.hh
@@ -40,7 +40,7 @@
extern int Errordebug;
#endif
/* "%code requires" blocks. */
-#line 32 "Error.yy" /* yacc.c:1909 */
+#line 32 "Error.yy" /* yacc.c:1915 */
#include "config_dap.h"
@@ -69,7 +69,7 @@ using namespace libdap;
extern int error_line_num; // defined in Error.lex
-#line 73 "Error.tab.hh" /* yacc.c:1909 */
+#line 73 "Error.tab.hh" /* yacc.c:1915 */
/* Token type. */
#ifndef YYTOKENTYPE
@@ -89,7 +89,7 @@ extern int error_line_num; // defined in Error.lex
union YYSTYPE
{
-#line 75 "Error.yy" /* yacc.c:1909 */
+#line 75 "Error.yy" /* yacc.c:1915 */
#ifdef __SUNPRO_CC
int boolean;
@@ -99,7 +99,7 @@ union YYSTYPE
int integer;
char *string;
-#line 103 "Error.tab.hh" /* yacc.c:1909 */
+#line 103 "Error.tab.hh" /* yacc.c:1915 */
};
typedef union YYSTYPE YYSTYPE;
diff --git a/Grid.cc b/Grid.cc
index 821250c..b0e2b3b 100644
--- a/Grid.cc
+++ b/Grid.cc
@@ -139,55 +139,99 @@ Grid::operator=(const Grid &rhs)
return *this;
}
-// FIXME transform_to_dap4 probably needs to run for side effect only.
-// drop the return BT and add variables to the D4Group that is passed
-// in instead of the DMR.
-//
-// Also need to handle the case where a Grid is part of a Structure
-BaseType *
+/**
+ *
+ */
+void
Grid::transform_to_dap4(D4Group *root, Constructor *container)
{
- BaseType *btp = array_var()->transform_to_dap4(root, container);
- Array *coverage = static_cast<Array*>(btp);
- if (!coverage)
- throw InternalErr(__FILE__, __LINE__, "Expected an Array while transforming a Grid (coverage)");
-
- coverage->set_parent(container);
-
- // Next find the maps; add them to the coverage and to the container,
- // the latter only on the condition that they are not already there.
-
+ DBG(cerr << __func__ << "() - BEGIN (name:"<< name() <<
+ ")(type:"<< type_name()<<
+ ")(root:'"<< root->name()<<"':"<<(void*)root <<
+ ")(container:'"<< container->name()<<"':"<< (void *) container<< ")"
+ << endl;);
+
+ vector<Array*> d4_map_arrays;
+
+ // We do the Map Arrays first because some people expect to see them
+ // delclared prior to the coverage array the utilizes them - even though that
+ // is not a requirement of DAP4 I did it here to make people happier.
+ // We add the maps arrays to the current container if needed and make a
+ // a vector of them so we can add D4Map objects to our Precious down
+ // below.
for (Map_iter i = map_begin(), e = map_end(); i != e; ++i) {
- btp = (*i)->transform_to_dap4(root, container);
- Array *map = static_cast<Array*>(btp);
- if (!map)
- throw InternalErr(__FILE__, __LINE__, "Expected an Array while transforming a Grid (map)");
-
- // map must be non-null (Grids cannot contain Grids in DAP2)
- if (map) {
- // Only add the map/array if it not already present; given the scoping rules
- // for DAP2 and the assumption the DDS is valid, testing for the same name
- // is good enough.
- if (!root->var(map->name())) {
- map->set_parent(container);
- container->add_var_nocopy(map); // this adds the array to the container
- }
- D4Map *dap4_map = new D4Map(map->name(), map, coverage); // bind the 'map' to the coverage
- coverage->maps()->add_map(dap4_map); // bind the coverage to the map
- }
- else {
- throw InternalErr(__FILE__, __LINE__,
- "transform_to_dap4() returned a null value where there can be no Grid.");
- }
+ DBG(cerr << __func__ << "() - Processing Map Array: '"<< (*i)->name() << "' ("<< (void *)(*i)<< ")" << endl;);
+ // Only add the map/array if it's not already present in the target DAP2 container.
+ // Given the scoping rules for DAP2 and the assumption the DDS is valid, testing for
+ // the same name is good enough. The point here is to be sure to only use the
+ // existing maps. This is an important issue when there are multiple Grids in the same
+ // dataset that utilize the same Map arrays data.
+ Array *the_map_array;;
+ Array *container_map_array = static_cast<Array*>(container->var((*i)->name()));
+ if(!container_map_array){
+ DBG(cerr << __func__ << "() - No Map Array '" << (*i)->name() << "' present in the current DAP4 container ("<<container->name()<< ":"<<(void*)container<< "). Let's fix that..." << endl;);
+ // Not in the container, so we check root group
+ Array *root_map_array = static_cast<Array*>(root->var((*i)->name()));
+ if (!root_map_array) {
+ // Not in the root group so we transform a new array and add it to container.
+ DBG(cerr << __func__ << "() - No Map Array '" << (*i)->name() << "' present in the root Group ("<<root->name()<< ":"<<(void*)root<< "). Let's fix that..." << endl;);
+ // transform it and add it to the container
+ (*i)->transform_to_dap4(root, container);
+ // Recover the new dap4 version from the container.
+ the_map_array = static_cast<Array*>(container->var((*i)->name()));
+ DBG(cerr << __func__ << "() - Transformed array '"<< the_map_array->name() <<
+ "' to DAP4 Array (" << (void *) the_map_array << ") added to container: '"<<
+ container->name() <<"'" << endl;);
+ }
+ else {
+ the_map_array = root_map_array;
+ DBG(cerr << __func__ << "() - Located Map Array '" << the_map_array->name() << "' (" <<
+ (void *) the_map_array << ") present in the root group ("<<root->name()<< ":"<<(void*)root <<
+ ")"<< endl;);
+ }
+ }
+ else {
+ the_map_array = container_map_array;
+ DBG(cerr << __func__ << "() - Located Map Array '" << the_map_array->name() << "' (" <<
+ (void *) the_map_array << ") present in the current DAP4 container ("<<container->name( )<< ":"<<
+ (void*)container<< ")" << endl;);
+ }
+ // We'll use these (below) to make D4Map objects for the coverage
+ d4_map_arrays.push_back(the_map_array);
}
- container->add_var_nocopy(coverage);
+ // Adds the coverage array to the container.
+ array_var()->transform_to_dap4(root, container);
+ // Get the new coverage array
+ BaseType *btp = container->var(array_var()->name());
+ Array *coverage = static_cast<Array*>(btp);
+ DBG(cerr << __func__ << "() - Transformed and added DAP4 coverage Array '"<< coverage->name() <<
+ "' to parent container: '" << container->name() << "'" << endl;);
+
+ coverage->attributes()->transform_to_dap4(get_attr_table());
+
+ DBG(cerr << __func__ << "() - " << "Coverage Array '"<< coverage->name() << "' attributes: " << endl;
+ XMLWriter xmlw;
+ coverage->get_attr_table().print_dap4(xmlw);
+ cerr << xmlw.get_doc() << endl;);
+
+ // Add the D4Maps
+ vector<Array*>::iterator d4aItr=d4_map_arrays.begin();
+ vector<Array*>::iterator end=d4_map_arrays.end();
+ for( ; d4aItr!=end ; d4aItr++){
+ Array *the_map_array = *d4aItr;
+ // Here we use the Map Array that we saved the Map
+ // name and Map Array reference for our map.
+ D4Map *d4_map = new D4Map(the_map_array->FQN(), the_map_array, coverage); // bind the 'map' to the coverage
+ coverage->maps()->add_map(d4_map); // bind the coverage to the map
+ // Clear the vector entry to ensure that ~Array doesn't
+ // get called when the (stack declared) vector goes out of scope.
+ *d4aItr = 0;
+ DBG(cerr << __func__ << "() - Added DAP4 Map Array: '"<< d4_map->name() <<
+ "' (" << (void *) d4_map->array() << ") to coverage: '" << coverage->name() << "'" << endl;);
- // Since a Grid (DAP2) to a Coverage (DAP4) removes a lexical scope
- // in favor of a set of relations, Grid::transform_to_dap4() does not
- // return a BaseType*. Callers should assume it has correctly added
- // stuff to the container and group.
- return 0;
+ }
+ DBG(cerr << __func__ << "() - END (grid:" << name() << ")" << endl;);
}
@@ -558,15 +602,33 @@ Grid::components(bool constrained)
void Grid::transfer_attributes(AttrTable *at_container)
{
- AttrTable *at = at_container->get_attr_table(name());
+ DBG( cerr << __func__ << "() - BEGIN "<< type_name() << " " << name() << " (at_container:"<< at_container->get_name() << ":"<<(void*)at_container<< ")" << endl;);
+ // At should be the attribute table for the Grid
+ AttrTable *at = at_container->get_attr_table(name());
if (at) {
+ DBG( cerr << __func__ << "() - Found AttrTable ("<< at->get_name() << ":" << (void*)at<< ")" << endl;);
at->set_is_global_attribute(false);
- array_var()->transfer_attributes(at);
+ // We don't monkey with the data array attributes because it usually just makes
+ // a mess. but:
+ // TODO We should come back and decide if we want to but configuration
+ // controls on this or do something smarter like check for duplicate values
+ // before merging the Array metadata into the Grid metadata
+ // SO - We don't copy the attributes like we used to:
+ //
+ // array_var()->transfer_attributes(at);
+ //
+ // And then to seal the deal we have to
+ // Mark them as not "global" so they don't get copied.
+ AttrTable *dvat = at->get_attr_table(array_var()->name());
+ if(dvat){
+ dvat->set_is_global_attribute(false);
+ }
Map_iter map = map_begin();
while (map != map_end()) {
+ DBG( cerr << __func__ << "() - Processing Map Array ("<< (*map)->name() << ":" << (void*)(*map)<< ")" << endl;);
(*map)->transfer_attributes(at);
map++;
}
@@ -577,7 +639,13 @@ void Grid::transfer_attributes(AttrTable *at_container)
AttrTable::Attr_iter at_p = at->attr_begin();
while (at_p != at->attr_end()) {
if (at->is_global_attribute(at_p)) {
- if (at->get_attr_type(at_p) == Attr_container)
+ DBG( cerr << __func__ << "() - " <<
+ "Adding unclaimed Attribute ("<<
+ at->get_type(at_p)<< ":" << at->get_name(at_p) << ":" << (void*)(*map)<<
+ ") from AttrTable (" << at->get_name() << ":" << (void*)at << ")" <<
+ " to the variable " << type_name() << " " << name() << endl;);
+
+ if (at->get_attr_type(at_p) == Attr_container)
get_attr_table().append_container(new AttrTable(*at->get_attr_table(at_p)), at->get_name(at_p));
else
get_attr_table().append_attr(at->get_name(at_p), at->get_type(at_p), at->get_attr_vector(at_p));
@@ -586,6 +654,10 @@ void Grid::transfer_attributes(AttrTable *at_container)
at_p++;
}
}
+ else {
+ DBG( cerr << __func__ << "() - No AttrTable named '"<< name() << "' was found in at_container ("<<at_container->get_name()<<":" << (void*)at<< ")" << endl;);
+ }
+ DBG( cerr << __func__ << "() - END "<< type_name() << " " << name() << " (at_container:"<< at_container->get_name() << ":"<<(void*)at_container<< ")" << endl;);
}
// When projected (using whatever the current constraint provides in the way
diff --git a/Grid.h b/Grid.h
index c26db92..82f938b 100644
--- a/Grid.h
+++ b/Grid.h
@@ -143,7 +143,7 @@ public:
Grid &operator=(const Grid &rhs);
virtual BaseType *ptr_duplicate();
- virtual BaseType *transform_to_dap4(D4Group *root, Constructor *container);
+ virtual void transform_to_dap4(D4Group *root, Constructor *container);
virtual bool is_dap2_only_type();
diff --git a/Int64.cc b/Int64.cc
index c95c111..41dbaf4 100644
--- a/Int64.cc
+++ b/Int64.cc
@@ -240,6 +240,29 @@ bool Int64::d4_ops(BaseType *b, int op)
}
}
+/** @brief DAP4 to DAP2 transform
+ *
+ * Return a DAP2 'copy' of the variable.
+ *
+ * @return A pointer to the transformed variable
+ */
+vector<BaseType *> *
+Int64::transform_to_dap2(AttrTable *)
+{
+#if 0
+ BaseType *dest = this->ptr_duplicate();
+ // convert the d4 attributes to a dap2 attribute table.
+ AttrTable *attrs = this->attributes()->get_AttrTable();
+ attrs->set_name(name());
+ dest->set_attr_table(*attrs);
+ dest->set_is_dap4(false);
+ // attrs->print(cerr,"",true);
+ return dest;
+#endif
+
+ return NULL;
+}
+
/** @brief dumps information about this object
*
* Displays the pointer value of this instance and information about this
diff --git a/Int64.h b/Int64.h
index 019e191..ce8a1d8 100644
--- a/Int64.h
+++ b/Int64.h
@@ -84,6 +84,7 @@ public:
virtual bool ops(BaseType *b, int op);
virtual bool d4_ops(BaseType *b, int op);
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
virtual void dump(ostream &strm) const ;
};
diff --git a/Int8.cc b/Int8.cc
index 755bf10..591fcc3 100644
--- a/Int8.cc
+++ b/Int8.cc
@@ -214,6 +214,32 @@ bool Int8::d4_ops(BaseType *b, int op)
}
}
+/** @brief DAP4 to DAP2 transform
+ *
+ * Return a DAP2 'copy' of the variable. In this
+ * case, since Int8 doesn't have a natural representation
+ * in DAP2 we are going to just call it a Byte .
+ * Why? Because SIZE.
+ *
+ * @param root The root group that should hold this new variable. Add Group-level
+ * stuff here (e.g., D4Dimensions).
+ * @param container Add the new variable to this container.
+ *
+ * @return A pointer to the transformed variable
+ */
+std::vector<BaseType *> *
+Int8::transform_to_dap2(AttrTable *parent_attr_table)
+{
+ vector<BaseType *> *vec = BaseType::transform_to_dap2(parent_attr_table);
+ if(vec->size()!=1){
+ ostringstream oss;
+ oss << __func__ << "() - Something Bad Happened. This transform should produce only ";
+ oss << " a single BaseType yet it produced " << vec->size();
+ throw new Error(internal_error,oss.str());
+ }
+ (*vec)[0]->set_type(dods_byte_c);
+ return vec;
+}
/**
* @brief dumps information about this object
*
diff --git a/Int8.h b/Int8.h
index 5175071..706b2c8 100644
--- a/Int8.h
+++ b/Int8.h
@@ -78,6 +78,7 @@ public:
virtual bool ops(BaseType *b, int op);
virtual bool d4_ops(BaseType *b, int op);
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
virtual void dump(ostream &strm) const ;
};
diff --git a/Makefile.am b/Makefile.am
index 39d226b..f5dab89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ endif
# or ./configure --enable-developer --disable-shared
# the --disable-shared is not required, but it seems to help with debuggers.
CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align
-TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
+TEST_COV_FLAGS = -g3 -ftest-coverage -fprofile-arcs
if BUILD_DEVELOPER
AM_CXXFLAGS += $(CXXFLAGS_DEBUG)
@@ -106,16 +106,21 @@ pkgconfig_DATA = libdap.pc libdapclient.pc libdapserver.pc
CLEANFILES = *.log *.output *.gcda *.gcno $(BISON_SRC) $(FLEX_SRC) \
dods-datatypes.h xdr-datatypes.h getdap.1 dap-config.1 getdap4.1
+HTML_DOCS=html
+DOXYGEN_CONF=doxy.conf
+
+# This target only builds the documents, it does not move them to
+# github. Use the 'gh-docs' target below for that.
.PHONY: docs
-docs: doxy.conf
- doxygen doxy.conf
- (cd docs && tar -czf html.tar.gz html)
+docs: ${DOXYGEN_CONF}
+ doxygen ${DOXYGEN_CONF}
-# Not needed. jhrg 1/4/16
-# doxy.conf: doxy.conf.in config.status
-# ./config.status --file=doxy.conf
+# GitHub.io docs
+.PHONY: gh-docs
+gh-docs:
+ ./build-gh-docs.sh
-# cccc computes metrics like Lines of code and McCabe. It'a available
+# cccc computes metrics like Lines of code and McCabe. It's available
# on the web...
.PHONY: cccc
cccc:
diff --git a/Makefile.in b/Makefile.in
index e558d7d..a4dbce6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in 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.
@@ -22,6 +21,51 @@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -47,18 +91,22 @@ bin_PROGRAMS = getdap$(EXEEXT) getdap4$(EXEEXT)
@DAP4_DEFINED_TRUE at am__append_5 = $(DAP4_CLIENT_HDR) $(DAP4_CLIENT_SRC)
@DAP4_DEFINED_TRUE at am__append_6 = $(DAP4_ONLY_HDR) $(DAP4_CLIENT_HDR)
subdir = .
-DIST_COMMON = README $(am__configure_deps) \
- $(am__pkginclude_HEADERS_DIST) $(dist_aclocal_DATA) \
- $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/abi_checker.xml.in $(srcdir)/config.h.in \
- $(srcdir)/dap-config.in $(srcdir)/dods-datatypes-config.h.in \
- $(srcdir)/doxy.conf.in $(srcdir)/libdap.pc.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(srcdir)/dods-datatypes-config.h.in \
+ $(srcdir)/xdr-datatypes-config.h.in $(srcdir)/libdap.pc.in \
$(srcdir)/libdapclient.pc.in $(srcdir)/libdapserver.pc.in \
- $(srcdir)/main_page.doxygen.in \
- $(srcdir)/xdr-datatypes-config.h.in $(top_srcdir)/configure \
- COPYING ChangeLog INSTALL NEWS conf/compile conf/config.guess \
+ $(srcdir)/main_page.doxygen.in $(srcdir)/doxy.conf.in \
+ $(srcdir)/abi_checker.xml.in $(srcdir)/dap-config.in \
+ $(top_srcdir)/conf/depcomp $(dist_aclocal_DATA) \
+ $(noinst_HEADERS) $(am__pkginclude_HEADERS_DIST) COPYING \
+ ChangeLog INSTALL NEWS README conf/compile conf/config.guess \
conf/config.rpath conf/config.sub conf/depcomp conf/install-sh \
- conf/ltmain.sh conf/missing
+ conf/missing conf/ltmain.sh $(top_srcdir)/conf/compile \
+ $(top_srcdir)/conf/config.guess \
+ $(top_srcdir)/conf/config.rpath $(top_srcdir)/conf/config.sub \
+ $(top_srcdir)/conf/install-sh $(top_srcdir)/conf/ltmain.sh \
+ $(top_srcdir)/conf/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
$(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -135,6 +183,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(pkgconfigdir)" \
@@ -200,7 +254,11 @@ am__objects_3 = libdap_la-D4StreamMarshaller.lo \
am_libdap_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_4)
libdap_la_OBJECTS = $(am_libdap_la_OBJECTS)
-libdap_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libdap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libdap_la_LDFLAGS) $(LDFLAGS) -o $@
libdapclient_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libdap.la \
@@ -218,16 +276,18 @@ am__objects_7 = libdapclient_la-D4Connect.lo
@DAP4_DEFINED_TRUE at am__objects_8 = $(am__objects_6) $(am__objects_7)
am_libdapclient_la_OBJECTS = $(am__objects_5) $(am__objects_8)
libdapclient_la_OBJECTS = $(am_libdapclient_la_OBJECTS)
-libdapclient_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(libdapclient_la_LDFLAGS) $(LDFLAGS) -o $@
+libdapclient_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libdapclient_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
libdapserver_la_DEPENDENCIES = libdap.la $(am__DEPENDENCIES_1)
am__objects_9 = DODSFilter.lo Ancillary.lo
am_libdapserver_la_OBJECTS = $(am__objects_9)
libdapserver_la_OBJECTS = $(am_libdapserver_la_OBJECTS)
-libdapserver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(libdapserver_la_LDFLAGS) $(LDFLAGS) -o $@
+libdapserver_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libdapserver_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
libparsers_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__objects_10 = libparsers_la-lex.das.lo libparsers_la-lex.dds.lo \
libparsers_la-lex.ce_expr.lo libparsers_la-lex.Error.lo
@@ -243,41 +303,77 @@ am_getdap4_OBJECTS = getdap4-getdap4.$(OBJEXT)
getdap4_OBJECTS = $(am_getdap4_OBJECTS)
getdap4_DEPENDENCIES = libdapclient.la libdap.la
SCRIPTS = $(bin_SCRIPTS)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
SOURCES = $(libdap_la_SOURCES) $(libdapclient_la_SOURCES) \
$(libdapserver_la_SOURCES) $(libparsers_la_SOURCES) \
$(getdap_SOURCES) $(getdap4_SOURCES)
DIST_SOURCES = $(am__libdap_la_SOURCES_DIST) \
$(am__libdapclient_la_SOURCES_DIST) $(libdapserver_la_SOURCES) \
$(libparsers_la_SOURCES) $(getdap_SOURCES) $(getdap4_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
@@ -312,18 +408,44 @@ am__pkginclude_HEADERS_DIST = AttrTable.h DAS.h DDS.h DataDDS.h \
HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in dods-datatypes-config.h.in \
+ xdr-datatypes-config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -351,13 +473,17 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
@@ -397,6 +523,7 @@ DAPLIB_REVISION = @DAPLIB_REVISION@
DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DVR = @DVR@
@@ -712,6 +839,7 @@ LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
@@ -745,6 +873,7 @@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
@@ -849,6 +978,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -891,7 +1021,6 @@ libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -923,7 +1052,7 @@ AM_CXXFLAGS = $(am__append_1) $(am__append_2)
# or ./configure --enable-developer --disable-shared
# the --disable-shared is not required, but it seems to help with debuggers.
CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align
-TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
+TEST_COV_FLAGS = -g3 -ftest-coverage -fprofile-arcs
SUBDIRS = gl d4_ce d4_function . unit-tests tests
DIST_SUBDIRS = gl d4_ce d4_function unit-tests tests
noinst_LTLIBRARIES = libparsers.la
@@ -975,6 +1104,8 @@ pkgconfig_DATA = libdap.pc libdapclient.pc libdapserver.pc
CLEANFILES = *.log *.output *.gcda *.gcno $(BISON_SRC) $(FLEX_SRC) \
dods-datatypes.h xdr-datatypes.h getdap.1 dap-config.1 getdap4.1
+HTML_DOCS = html
+DOXYGEN_CONF = doxy.conf
###########################################################################
@@ -1058,7 +1189,7 @@ all: $(BUILT_SOURCES) config.h dods-datatypes-config.h xdr-datatypes-config.h
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -1094,10 +1225,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(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
@@ -1108,20 +1237,16 @@ $(srcdir)/config.h.in: $(am__configure_deps)
touch $@
dods-datatypes-config.h: stamp-h2
- @if test ! -f $@; then \
- rm -f stamp-h2; \
- $(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; \
- $(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
@@ -1143,9 +1268,9 @@ abi_checker.xml: $(top_builddir)/config.status $(srcdir)/abi_checker.xml.in
cd $(top_builddir) && $(SHELL) ./config.status $@
dap-config: $(top_builddir)/config.status $(srcdir)/dap-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -1153,6 +1278,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
@@ -1168,21 +1295,25 @@ uninstall-libLTLIBRARIES:
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(noinst_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
GNU/$(am__dirstamp):
@$(MKDIR_P) GNU
@: > GNU/$(am__dirstamp)
@@ -1193,24 +1324,33 @@ GNU/libdap_la-GetOpt.lo: GNU/$(am__dirstamp) \
GNU/$(DEPDIR)/$(am__dirstamp)
GNU/libdap_la-GNURegex.lo: GNU/$(am__dirstamp) \
GNU/$(DEPDIR)/$(am__dirstamp)
-libdap.la: $(libdap_la_OBJECTS) $(libdap_la_DEPENDENCIES)
- $(libdap_la_LINK) -rpath $(libdir) $(libdap_la_OBJECTS) $(libdap_la_LIBADD) $(LIBS)
-libdapclient.la: $(libdapclient_la_OBJECTS) $(libdapclient_la_DEPENDENCIES)
- $(libdapclient_la_LINK) -rpath $(libdir) $(libdapclient_la_OBJECTS) $(libdapclient_la_LIBADD) $(LIBS)
-libdapserver.la: $(libdapserver_la_OBJECTS) $(libdapserver_la_DEPENDENCIES)
- $(libdapserver_la_LINK) -rpath $(libdir) $(libdapserver_la_OBJECTS) $(libdapserver_la_LIBADD) $(LIBS)
-libparsers.la: $(libparsers_la_OBJECTS) $(libparsers_la_DEPENDENCIES)
- $(CXXLINK) $(libparsers_la_OBJECTS) $(libparsers_la_LIBADD) $(LIBS)
+
+libdap.la: $(libdap_la_OBJECTS) $(libdap_la_DEPENDENCIES) $(EXTRA_libdap_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(libdap_la_LINK) -rpath $(libdir) $(libdap_la_OBJECTS) $(libdap_la_LIBADD) $(LIBS)
+
+libdapclient.la: $(libdapclient_la_OBJECTS) $(libdapclient_la_DEPENDENCIES) $(EXTRA_libdapclient_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(libdapclient_la_LINK) -rpath $(libdir) $(libdapclient_la_OBJECTS) $(libdapclient_la_LIBADD) $(LIBS)
+
+libdapserver.la: $(libdapserver_la_OBJECTS) $(libdapserver_la_DEPENDENCIES) $(EXTRA_libdapserver_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(libdapserver_la_LINK) -rpath $(libdir) $(libdapserver_la_OBJECTS) $(libdapserver_la_LIBADD) $(LIBS)
+
+libparsers.la: $(libparsers_la_OBJECTS) $(libparsers_la_DEPENDENCIES) $(EXTRA_libparsers_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(libparsers_la_OBJECTS) $(libparsers_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -1231,7 +1371,8 @@ uninstall-binPROGRAMS:
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -1244,16 +1385,21 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-getdap$(EXEEXT): $(getdap_OBJECTS) $(getdap_DEPENDENCIES)
+
+getdap$(EXEEXT): $(getdap_OBJECTS) $(getdap_DEPENDENCIES) $(EXTRA_getdap_DEPENDENCIES)
@rm -f getdap$(EXEEXT)
- $(CXXLINK) $(getdap_OBJECTS) $(getdap_LDADD) $(LIBS)
-getdap4$(EXEEXT): $(getdap4_OBJECTS) $(getdap4_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(getdap_OBJECTS) $(getdap_LDADD) $(LIBS)
+
+getdap4$(EXEEXT): $(getdap4_OBJECTS) $(getdap4_DEPENDENCIES) $(EXTRA_getdap4_DEPENDENCIES)
@rm -f getdap4$(EXEEXT)
- $(CXXLINK) $(getdap4_OBJECTS) $(getdap4_LDADD) $(LIBS)
+ $(AM_V_CXXLD)$(CXXLINK) $(getdap4_OBJECTS) $(getdap4_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -1281,16 +1427,12 @@ uninstall-binSCRIPTS:
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f GNU/libdap_la-GNURegex.$(OBJEXT)
- -rm -f GNU/libdap_la-GNURegex.lo
- -rm -f GNU/libdap_la-GetOpt.$(OBJEXT)
- -rm -f GNU/libdap_la-GetOpt.lo
+ -rm -f GNU/*.$(OBJEXT)
+ -rm -f GNU/*.lo
distclean-compile:
-rm -f *.tab.c
@@ -1385,668 +1527,668 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at GNU/$(DEPDIR)/libdap_la-GetOpt.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
libdap_la-xdrutil_ppc.lo: xdrutil_ppc.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdap_la-xdrutil_ppc.lo -MD -MP -MF $(DEPDIR)/libdap_la-xdrutil_ppc.Tpo -c -o libdap_la-xdrutil_ppc.lo `test -f 'xdrutil_ppc.c' || echo '$(srcdir)/'`xdrutil_ppc.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-xdrutil_ppc.Tpo $(DEPDIR)/libdap_la-xdrutil_ppc.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xdrutil_ppc.c' object='libdap_la-xdrutil_ppc.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdap_la-xdrutil_ppc.lo -MD -MP -MF $(DEPDIR)/libdap_la-xdrutil_ppc.Tpo -c -o libdap_la-xdrutil_ppc.lo `test -f 'xdrutil_ppc.c' || echo '$(srcdir)/'`xdrutil_ppc.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-xdrutil_ppc.Tpo $(DEPDIR)/libdap_la-xdrutil_ppc.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xdrutil_ppc.c' object='libdap_la-xdrutil_ppc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdap_la-xdrutil_ppc.lo `test -f 'xdrutil_ppc.c' || echo '$(srcdir)/'`xdrutil_ppc.c
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libdap_la-xdrutil_ppc.lo `test -f 'xdrutil_ppc.c' || echo '$(srcdir)/'`xdrutil_ppc.c
.cc.o:
- at am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.lo:
- at am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
libdap_la-AttrTable.lo: AttrTable.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-AttrTable.lo -MD -MP -MF $(DEPDIR)/libdap_la-AttrTable.Tpo -c -o libdap_la-AttrTable.lo `test -f 'AttrTable.cc' || echo '$(srcdir)/'`AttrTable.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-AttrTable.Tpo $(DEPDIR)/libdap_la-AttrTable.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='AttrTable.cc' object='libdap_la-AttrTable.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-AttrTable.lo -MD -MP -MF $(DEPDIR)/libdap_la-AttrTable.Tpo -c -o libdap_la-AttrTable.lo `test -f 'AttrTable.cc' || echo '$(srcdir)/'`AttrTable.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-AttrTable.Tpo $(DEPDIR)/libdap_la-AttrTable.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='AttrTable.cc' object='libdap_la-AttrTable.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-AttrTable.lo `test -f 'AttrTable.cc' || echo '$(srcdir)/'`AttrTable.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-AttrTable.lo `test -f 'AttrTable.cc' || echo '$(srcdir)/'`AttrTable.cc
libdap_la-DAS.lo: DAS.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DAS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DAS.Tpo -c -o libdap_la-DAS.lo `test -f 'DAS.cc' || echo '$(srcdir)/'`DAS.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-DAS.Tpo $(DEPDIR)/libdap_la-DAS.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DAS.cc' object='libdap_la-DAS.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DAS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DAS.Tpo -c -o libdap_la-DAS.lo `test -f 'DAS.cc' || echo '$(srcdir)/'`DAS.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DAS.Tpo $(DEPDIR)/libdap_la-DAS.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DAS.cc' object='libdap_la-DAS.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DAS.lo `test -f 'DAS.cc' || echo '$(srcdir)/'`DAS.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DAS.lo `test -f 'DAS.cc' || echo '$(srcdir)/'`DAS.cc
libdap_la-DDS.lo: DDS.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DDS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DDS.Tpo -c -o libdap_la-DDS.lo `test -f 'DDS.cc' || echo '$(srcdir)/'`DDS.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-DDS.Tpo $(DEPDIR)/libdap_la-DDS.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DDS.cc' object='libdap_la-DDS.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DDS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DDS.Tpo -c -o libdap_la-DDS.lo `test -f 'DDS.cc' || echo '$(srcdir)/'`DDS.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DDS.Tpo $(DEPDIR)/libdap_la-DDS.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DDS.cc' object='libdap_la-DDS.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DDS.lo `test -f 'DDS.cc' || echo '$(srcdir)/'`DDS.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DDS.lo `test -f 'DDS.cc' || echo '$(srcdir)/'`DDS.cc
libdap_la-DataDDS.lo: DataDDS.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DataDDS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DataDDS.Tpo -c -o libdap_la-DataDDS.lo `test -f 'DataDDS.cc' || echo '$(srcdir)/'`DataDDS.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-DataDDS.Tpo $(DEPDIR)/libdap_la-DataDDS.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DataDDS.cc' object='libdap_la-DataDDS.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DataDDS.lo -MD -MP -MF $(DEPDIR)/libdap_la-DataDDS.Tpo -c -o libdap_la-DataDDS.lo `test -f 'DataDDS.cc' || echo '$(srcdir)/'`DataDDS.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DataDDS.Tpo $(DEPDIR)/libdap_la-DataDDS.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DataDDS.cc' object='libdap_la-DataDDS.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DataDDS.lo `test -f 'DataDDS.cc' || echo '$(srcdir)/'`DataDDS.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DataDDS.lo `test -f 'DataDDS.cc' || echo '$(srcdir)/'`DataDDS.cc
libdap_la-DDXParserSAX2.lo: DDXParserSAX2.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DDXParserSAX2.lo -MD -MP -MF $(DEPDIR)/libdap_la-DDXParserSAX2.Tpo -c -o libdap_la-DDXParserSAX2.lo `test -f 'DDXParserSAX2.cc' || echo '$(srcdir)/'`DDXParserSAX2.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-DDXParserSAX2.Tpo $(DEPDIR)/libdap_la-DDXParserSAX2.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DDXParserSAX2.cc' object='libdap_la-DDXParserSAX2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DDXParserSAX2.lo -MD -MP -MF $(DEPDIR)/libdap_la-DDXParserSAX2.Tpo -c -o libdap_la-DDXParserSAX2.lo `test -f 'DDXParserSAX2.cc' || echo '$(srcdir)/'`DDXParserSAX2.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DDXParserSAX2.Tpo $(DEPDIR)/libdap_la-DDXParserSAX2.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DDXParserSAX2.cc' object='libdap_la-DDXParserSAX2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DDXParserSAX2.lo `test -f 'DDXParserSAX2.cc' || echo '$(srcdir)/'`DDXParserSAX2.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DDXParserSAX2.lo `test -f 'DDXParserSAX2.cc' || echo '$(srcdir)/'`DDXParserSAX2.cc
libdap_la-BaseType.lo: BaseType.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-BaseType.lo -MD -MP -MF $(DEPDIR)/libdap_la-BaseType.Tpo -c -o libdap_la-BaseType.lo `test -f 'BaseType.cc' || echo '$(srcdir)/'`BaseType.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-BaseType.Tpo $(DEPDIR)/libdap_la-BaseType.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='BaseType.cc' object='libdap_la-BaseType.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-BaseType.lo -MD -MP -MF $(DEPDIR)/libdap_la-BaseType.Tpo -c -o libdap_la-BaseType.lo `test -f 'BaseType.cc' || echo '$(srcdir)/'`BaseType.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-BaseType.Tpo $(DEPDIR)/libdap_la-BaseType.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='BaseType.cc' object='libdap_la-BaseType.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-BaseType.lo `test -f 'BaseType.cc' || echo '$(srcdir)/'`BaseType.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-BaseType.lo `test -f 'BaseType.cc' || echo '$(srcdir)/'`BaseType.cc
libdap_la-Byte.lo: Byte.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Byte.lo -MD -MP -MF $(DEPDIR)/libdap_la-Byte.Tpo -c -o libdap_la-Byte.lo `test -f 'Byte.cc' || echo '$(srcdir)/'`Byte.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Byte.Tpo $(DEPDIR)/libdap_la-Byte.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Byte.cc' object='libdap_la-Byte.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Byte.lo -MD -MP -MF $(DEPDIR)/libdap_la-Byte.Tpo -c -o libdap_la-Byte.lo `test -f 'Byte.cc' || echo '$(srcdir)/'`Byte.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Byte.Tpo $(DEPDIR)/libdap_la-Byte.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Byte.cc' object='libdap_la-Byte.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Byte.lo `test -f 'Byte.cc' || echo '$(srcdir)/'`Byte.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Byte.lo `test -f 'Byte.cc' || echo '$(srcdir)/'`Byte.cc
libdap_la-Int32.lo: Int32.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int32.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int32.Tpo -c -o libdap_la-Int32.lo `test -f 'Int32.cc' || echo '$(srcdir)/'`Int32.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Int32.Tpo $(DEPDIR)/libdap_la-Int32.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Int32.cc' object='libdap_la-Int32.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int32.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int32.Tpo -c -o libdap_la-Int32.lo `test -f 'Int32.cc' || echo '$(srcdir)/'`Int32.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Int32.Tpo $(DEPDIR)/libdap_la-Int32.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Int32.cc' object='libdap_la-Int32.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int32.lo `test -f 'Int32.cc' || echo '$(srcdir)/'`Int32.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int32.lo `test -f 'Int32.cc' || echo '$(srcdir)/'`Int32.cc
libdap_la-Float64.lo: Float64.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Float64.lo -MD -MP -MF $(DEPDIR)/libdap_la-Float64.Tpo -c -o libdap_la-Float64.lo `test -f 'Float64.cc' || echo '$(srcdir)/'`Float64.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Float64.Tpo $(DEPDIR)/libdap_la-Float64.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Float64.cc' object='libdap_la-Float64.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Float64.lo -MD -MP -MF $(DEPDIR)/libdap_la-Float64.Tpo -c -o libdap_la-Float64.lo `test -f 'Float64.cc' || echo '$(srcdir)/'`Float64.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Float64.Tpo $(DEPDIR)/libdap_la-Float64.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Float64.cc' object='libdap_la-Float64.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Float64.lo `test -f 'Float64.cc' || echo '$(srcdir)/'`Float64.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Float64.lo `test -f 'Float64.cc' || echo '$(srcdir)/'`Float64.cc
libdap_la-Str.lo: Str.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Str.lo -MD -MP -MF $(DEPDIR)/libdap_la-Str.Tpo -c -o libdap_la-Str.lo `test -f 'Str.cc' || echo '$(srcdir)/'`Str.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Str.Tpo $(DEPDIR)/libdap_la-Str.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Str.cc' object='libdap_la-Str.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Str.lo -MD -MP -MF $(DEPDIR)/libdap_la-Str.Tpo -c -o libdap_la-Str.lo `test -f 'Str.cc' || echo '$(srcdir)/'`Str.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Str.Tpo $(DEPDIR)/libdap_la-Str.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Str.cc' object='libdap_la-Str.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Str.lo `test -f 'Str.cc' || echo '$(srcdir)/'`Str.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Str.lo `test -f 'Str.cc' || echo '$(srcdir)/'`Str.cc
libdap_la-Url.lo: Url.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Url.lo -MD -MP -MF $(DEPDIR)/libdap_la-Url.Tpo -c -o libdap_la-Url.lo `test -f 'Url.cc' || echo '$(srcdir)/'`Url.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Url.Tpo $(DEPDIR)/libdap_la-Url.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Url.cc' object='libdap_la-Url.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Url.lo -MD -MP -MF $(DEPDIR)/libdap_la-Url.Tpo -c -o libdap_la-Url.lo `test -f 'Url.cc' || echo '$(srcdir)/'`Url.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Url.Tpo $(DEPDIR)/libdap_la-Url.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Url.cc' object='libdap_la-Url.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Url.lo `test -f 'Url.cc' || echo '$(srcdir)/'`Url.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Url.lo `test -f 'Url.cc' || echo '$(srcdir)/'`Url.cc
libdap_la-Vector.lo: Vector.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Vector.lo -MD -MP -MF $(DEPDIR)/libdap_la-Vector.Tpo -c -o libdap_la-Vector.lo `test -f 'Vector.cc' || echo '$(srcdir)/'`Vector.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Vector.Tpo $(DEPDIR)/libdap_la-Vector.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Vector.cc' object='libdap_la-Vector.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Vector.lo -MD -MP -MF $(DEPDIR)/libdap_la-Vector.Tpo -c -o libdap_la-Vector.lo `test -f 'Vector.cc' || echo '$(srcdir)/'`Vector.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Vector.Tpo $(DEPDIR)/libdap_la-Vector.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Vector.cc' object='libdap_la-Vector.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Vector.lo `test -f 'Vector.cc' || echo '$(srcdir)/'`Vector.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Vector.lo `test -f 'Vector.cc' || echo '$(srcdir)/'`Vector.cc
libdap_la-Array.lo: Array.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Array.lo -MD -MP -MF $(DEPDIR)/libdap_la-Array.Tpo -c -o libdap_la-Array.lo `test -f 'Array.cc' || echo '$(srcdir)/'`Array.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Array.Tpo $(DEPDIR)/libdap_la-Array.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Array.cc' object='libdap_la-Array.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Array.lo -MD -MP -MF $(DEPDIR)/libdap_la-Array.Tpo -c -o libdap_la-Array.lo `test -f 'Array.cc' || echo '$(srcdir)/'`Array.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Array.Tpo $(DEPDIR)/libdap_la-Array.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Array.cc' object='libdap_la-Array.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Array.lo `test -f 'Array.cc' || echo '$(srcdir)/'`Array.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Array.lo `test -f 'Array.cc' || echo '$(srcdir)/'`Array.cc
libdap_la-Structure.lo: Structure.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Structure.lo -MD -MP -MF $(DEPDIR)/libdap_la-Structure.Tpo -c -o libdap_la-Structure.lo `test -f 'Structure.cc' || echo '$(srcdir)/'`Structure.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Structure.Tpo $(DEPDIR)/libdap_la-Structure.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Structure.cc' object='libdap_la-Structure.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Structure.lo -MD -MP -MF $(DEPDIR)/libdap_la-Structure.Tpo -c -o libdap_la-Structure.lo `test -f 'Structure.cc' || echo '$(srcdir)/'`Structure.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Structure.Tpo $(DEPDIR)/libdap_la-Structure.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Structure.cc' object='libdap_la-Structure.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Structure.lo `test -f 'Structure.cc' || echo '$(srcdir)/'`Structure.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Structure.lo `test -f 'Structure.cc' || echo '$(srcdir)/'`Structure.cc
libdap_la-Sequence.lo: Sequence.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Sequence.lo -MD -MP -MF $(DEPDIR)/libdap_la-Sequence.Tpo -c -o libdap_la-Sequence.lo `test -f 'Sequence.cc' || echo '$(srcdir)/'`Sequence.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Sequence.Tpo $(DEPDIR)/libdap_la-Sequence.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Sequence.cc' object='libdap_la-Sequence.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Sequence.lo -MD -MP -MF $(DEPDIR)/libdap_la-Sequence.Tpo -c -o libdap_la-Sequence.lo `test -f 'Sequence.cc' || echo '$(srcdir)/'`Sequence.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Sequence.Tpo $(DEPDIR)/libdap_la-Sequence.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Sequence.cc' object='libdap_la-Sequence.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Sequence.lo `test -f 'Sequence.cc' || echo '$(srcdir)/'`Sequence.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Sequence.lo `test -f 'Sequence.cc' || echo '$(srcdir)/'`Sequence.cc
libdap_la-Grid.lo: Grid.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Grid.lo -MD -MP -MF $(DEPDIR)/libdap_la-Grid.Tpo -c -o libdap_la-Grid.lo `test -f 'Grid.cc' || echo '$(srcdir)/'`Grid.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Grid.Tpo $(DEPDIR)/libdap_la-Grid.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Grid.cc' object='libdap_la-Grid.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Grid.lo -MD -MP -MF $(DEPDIR)/libdap_la-Grid.Tpo -c -o libdap_la-Grid.lo `test -f 'Grid.cc' || echo '$(srcdir)/'`Grid.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Grid.Tpo $(DEPDIR)/libdap_la-Grid.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Grid.cc' object='libdap_la-Grid.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Grid.lo `test -f 'Grid.cc' || echo '$(srcdir)/'`Grid.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Grid.lo `test -f 'Grid.cc' || echo '$(srcdir)/'`Grid.cc
libdap_la-UInt32.lo: UInt32.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt32.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt32.Tpo -c -o libdap_la-UInt32.lo `test -f 'UInt32.cc' || echo '$(srcdir)/'`UInt32.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-UInt32.Tpo $(DEPDIR)/libdap_la-UInt32.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='UInt32.cc' object='libdap_la-UInt32.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt32.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt32.Tpo -c -o libdap_la-UInt32.lo `test -f 'UInt32.cc' || echo '$(srcdir)/'`UInt32.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-UInt32.Tpo $(DEPDIR)/libdap_la-UInt32.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='UInt32.cc' object='libdap_la-UInt32.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt32.lo `test -f 'UInt32.cc' || echo '$(srcdir)/'`UInt32.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt32.lo `test -f 'UInt32.cc' || echo '$(srcdir)/'`UInt32.cc
libdap_la-Int16.lo: Int16.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int16.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int16.Tpo -c -o libdap_la-Int16.lo `test -f 'Int16.cc' || echo '$(srcdir)/'`Int16.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Int16.Tpo $(DEPDIR)/libdap_la-Int16.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Int16.cc' object='libdap_la-Int16.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int16.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int16.Tpo -c -o libdap_la-Int16.lo `test -f 'Int16.cc' || echo '$(srcdir)/'`Int16.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Int16.Tpo $(DEPDIR)/libdap_la-Int16.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Int16.cc' object='libdap_la-Int16.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int16.lo `test -f 'Int16.cc' || echo '$(srcdir)/'`Int16.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int16.lo `test -f 'Int16.cc' || echo '$(srcdir)/'`Int16.cc
libdap_la-UInt16.lo: UInt16.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt16.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt16.Tpo -c -o libdap_la-UInt16.lo `test -f 'UInt16.cc' || echo '$(srcdir)/'`UInt16.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-UInt16.Tpo $(DEPDIR)/libdap_la-UInt16.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='UInt16.cc' object='libdap_la-UInt16.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt16.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt16.Tpo -c -o libdap_la-UInt16.lo `test -f 'UInt16.cc' || echo '$(srcdir)/'`UInt16.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-UInt16.Tpo $(DEPDIR)/libdap_la-UInt16.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='UInt16.cc' object='libdap_la-UInt16.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt16.lo `test -f 'UInt16.cc' || echo '$(srcdir)/'`UInt16.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt16.lo `test -f 'UInt16.cc' || echo '$(srcdir)/'`UInt16.cc
libdap_la-Float32.lo: Float32.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Float32.lo -MD -MP -MF $(DEPDIR)/libdap_la-Float32.Tpo -c -o libdap_la-Float32.lo `test -f 'Float32.cc' || echo '$(srcdir)/'`Float32.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Float32.Tpo $(DEPDIR)/libdap_la-Float32.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Float32.cc' object='libdap_la-Float32.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Float32.lo -MD -MP -MF $(DEPDIR)/libdap_la-Float32.Tpo -c -o libdap_la-Float32.lo `test -f 'Float32.cc' || echo '$(srcdir)/'`Float32.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Float32.Tpo $(DEPDIR)/libdap_la-Float32.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Float32.cc' object='libdap_la-Float32.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Float32.lo `test -f 'Float32.cc' || echo '$(srcdir)/'`Float32.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Float32.lo `test -f 'Float32.cc' || echo '$(srcdir)/'`Float32.cc
libdap_la-Constructor.lo: Constructor.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Constructor.lo -MD -MP -MF $(DEPDIR)/libdap_la-Constructor.Tpo -c -o libdap_la-Constructor.lo `test -f 'Constructor.cc' || echo '$(srcdir)/'`Constructor.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Constructor.Tpo $(DEPDIR)/libdap_la-Constructor.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Constructor.cc' object='libdap_la-Constructor.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Constructor.lo -MD -MP -MF $(DEPDIR)/libdap_la-Constructor.Tpo -c -o libdap_la-Constructor.lo `test -f 'Constructor.cc' || echo '$(srcdir)/'`Constructor.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Constructor.Tpo $(DEPDIR)/libdap_la-Constructor.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Constructor.cc' object='libdap_la-Constructor.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Constructor.lo `test -f 'Constructor.cc' || echo '$(srcdir)/'`Constructor.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Constructor.lo `test -f 'Constructor.cc' || echo '$(srcdir)/'`Constructor.cc
libdap_la-BaseTypeFactory.lo: BaseTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-BaseTypeFactory.lo -MD -MP -MF $(DEPDIR)/libdap_la-BaseTypeFactory.Tpo -c -o libdap_la-BaseTypeFactory.lo `test -f 'BaseTypeFactory.cc' || echo '$(srcdir)/'`BaseTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-BaseTypeFactory.Tpo $(DEPDIR)/libdap_la-BaseTypeFactory.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='BaseTypeFactory.cc' object='libdap_la-BaseTypeFactory.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-BaseTypeFactory.lo -MD -MP -MF $(DEPDIR)/libdap_la-BaseTypeFactory.Tpo -c -o libdap_la-BaseTypeFactory.lo `test -f 'BaseTypeFactory.cc' || echo '$(srcdir)/'`BaseTypeFactory.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-BaseTypeFactory.Tpo $(DEPDIR)/libdap_la-BaseTypeFactory.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='BaseTypeFactory.cc' object='libdap_la-BaseTypeFactory.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-BaseTypeFactory.lo `test -f 'BaseTypeFactory.cc' || echo '$(srcdir)/'`BaseTypeFactory.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-BaseTypeFactory.lo `test -f 'BaseTypeFactory.cc' || echo '$(srcdir)/'`BaseTypeFactory.cc
libdap_la-SignalHandler.lo: SignalHandler.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-SignalHandler.lo -MD -MP -MF $(DEPDIR)/libdap_la-SignalHandler.Tpo -c -o libdap_la-SignalHandler.lo `test -f 'SignalHandler.cc' || echo '$(srcdir)/'`SignalHandler.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-SignalHandler.Tpo $(DEPDIR)/libdap_la-SignalHandler.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='SignalHandler.cc' object='libdap_la-SignalHandler.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-SignalHandler.lo -MD -MP -MF $(DEPDIR)/libdap_la-SignalHandler.Tpo -c -o libdap_la-SignalHandler.lo `test -f 'SignalHandler.cc' || echo '$(srcdir)/'`SignalHandler.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-SignalHandler.Tpo $(DEPDIR)/libdap_la-SignalHandler.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SignalHandler.cc' object='libdap_la-SignalHandler.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-SignalHandler.lo `test -f 'SignalHandler.cc' || echo '$(srcdir)/'`SignalHandler.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-SignalHandler.lo `test -f 'SignalHandler.cc' || echo '$(srcdir)/'`SignalHandler.cc
libdap_la-Error.lo: Error.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Error.lo -MD -MP -MF $(DEPDIR)/libdap_la-Error.Tpo -c -o libdap_la-Error.lo `test -f 'Error.cc' || echo '$(srcdir)/'`Error.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Error.Tpo $(DEPDIR)/libdap_la-Error.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Error.cc' object='libdap_la-Error.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Error.lo -MD -MP -MF $(DEPDIR)/libdap_la-Error.Tpo -c -o libdap_la-Error.lo `test -f 'Error.cc' || echo '$(srcdir)/'`Error.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Error.Tpo $(DEPDIR)/libdap_la-Error.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Error.cc' object='libdap_la-Error.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Error.lo `test -f 'Error.cc' || echo '$(srcdir)/'`Error.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Error.lo `test -f 'Error.cc' || echo '$(srcdir)/'`Error.cc
libdap_la-InternalErr.lo: InternalErr.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-InternalErr.lo -MD -MP -MF $(DEPDIR)/libdap_la-InternalErr.Tpo -c -o libdap_la-InternalErr.lo `test -f 'InternalErr.cc' || echo '$(srcdir)/'`InternalErr.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-InternalErr.Tpo $(DEPDIR)/libdap_la-InternalErr.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='InternalErr.cc' object='libdap_la-InternalErr.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-InternalErr.lo -MD -MP -MF $(DEPDIR)/libdap_la-InternalErr.Tpo -c -o libdap_la-InternalErr.lo `test -f 'InternalErr.cc' || echo '$(srcdir)/'`InternalErr.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-InternalErr.Tpo $(DEPDIR)/libdap_la-InternalErr.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='InternalErr.cc' object='libdap_la-InternalErr.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-InternalErr.lo `test -f 'InternalErr.cc' || echo '$(srcdir)/'`InternalErr.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-InternalErr.lo `test -f 'InternalErr.cc' || echo '$(srcdir)/'`InternalErr.cc
libdap_la-util.lo: util.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-util.lo -MD -MP -MF $(DEPDIR)/libdap_la-util.Tpo -c -o libdap_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-util.Tpo $(DEPDIR)/libdap_la-util.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util.cc' object='libdap_la-util.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-util.lo -MD -MP -MF $(DEPDIR)/libdap_la-util.Tpo -c -o libdap_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-util.Tpo $(DEPDIR)/libdap_la-util.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='util.cc' object='libdap_la-util.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
libdap_la-parser-util.lo: parser-util.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-parser-util.lo -MD -MP -MF $(DEPDIR)/libdap_la-parser-util.Tpo -c -o libdap_la-parser-util.lo `test -f 'parser-util.cc' || echo '$(srcdir)/'`parser-util.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-parser-util.Tpo $(DEPDIR)/libdap_la-parser-util.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='parser-util.cc' object='libdap_la-parser-util.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-parser-util.lo -MD -MP -MF $(DEPDIR)/libdap_la-parser-util.Tpo -c -o libdap_la-parser-util.lo `test -f 'parser-util.cc' || echo '$(srcdir)/'`parser-util.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-parser-util.Tpo $(DEPDIR)/libdap_la-parser-util.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='parser-util.cc' object='libdap_la-parser-util.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-parser-util.lo `test -f 'parser-util.cc' || echo '$(srcdir)/'`parser-util.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-parser-util.lo `test -f 'parser-util.cc' || echo '$(srcdir)/'`parser-util.cc
libdap_la-escaping.lo: escaping.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-escaping.lo -MD -MP -MF $(DEPDIR)/libdap_la-escaping.Tpo -c -o libdap_la-escaping.lo `test -f 'escaping.cc' || echo '$(srcdir)/'`escaping.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-escaping.Tpo $(DEPDIR)/libdap_la-escaping.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='escaping.cc' object='libdap_la-escaping.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-escaping.lo -MD -MP -MF $(DEPDIR)/libdap_la-escaping.Tpo -c -o libdap_la-escaping.lo `test -f 'escaping.cc' || echo '$(srcdir)/'`escaping.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-escaping.Tpo $(DEPDIR)/libdap_la-escaping.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='escaping.cc' object='libdap_la-escaping.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-escaping.lo `test -f 'escaping.cc' || echo '$(srcdir)/'`escaping.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-escaping.lo `test -f 'escaping.cc' || echo '$(srcdir)/'`escaping.cc
libdap_la-Clause.lo: Clause.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Clause.lo -MD -MP -MF $(DEPDIR)/libdap_la-Clause.Tpo -c -o libdap_la-Clause.lo `test -f 'Clause.cc' || echo '$(srcdir)/'`Clause.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Clause.Tpo $(DEPDIR)/libdap_la-Clause.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Clause.cc' object='libdap_la-Clause.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Clause.lo -MD -MP -MF $(DEPDIR)/libdap_la-Clause.Tpo -c -o libdap_la-Clause.lo `test -f 'Clause.cc' || echo '$(srcdir)/'`Clause.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Clause.Tpo $(DEPDIR)/libdap_la-Clause.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Clause.cc' object='libdap_la-Clause.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Clause.lo `test -f 'Clause.cc' || echo '$(srcdir)/'`Clause.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Clause.lo `test -f 'Clause.cc' || echo '$(srcdir)/'`Clause.cc
libdap_la-RValue.lo: RValue.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-RValue.lo -MD -MP -MF $(DEPDIR)/libdap_la-RValue.Tpo -c -o libdap_la-RValue.lo `test -f 'RValue.cc' || echo '$(srcdir)/'`RValue.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-RValue.Tpo $(DEPDIR)/libdap_la-RValue.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='RValue.cc' object='libdap_la-RValue.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-RValue.lo -MD -MP -MF $(DEPDIR)/libdap_la-RValue.Tpo -c -o libdap_la-RValue.lo `test -f 'RValue.cc' || echo '$(srcdir)/'`RValue.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-RValue.Tpo $(DEPDIR)/libdap_la-RValue.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='RValue.cc' object='libdap_la-RValue.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-RValue.lo `test -f 'RValue.cc' || echo '$(srcdir)/'`RValue.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-RValue.lo `test -f 'RValue.cc' || echo '$(srcdir)/'`RValue.cc
libdap_la-ConstraintEvaluator.lo: ConstraintEvaluator.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ConstraintEvaluator.lo -MD -MP -MF $(DEPDIR)/libdap_la-ConstraintEvaluator.Tpo -c -o libdap_la-ConstraintEvaluator.lo `test -f 'ConstraintEvaluator.cc' || echo '$(srcdir)/'`ConstraintEvaluator.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-ConstraintEvaluator.Tpo $(DEPDIR)/libdap_la-ConstraintEvaluator.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ConstraintEvaluator.cc' object='libdap_la-ConstraintEvaluator.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ConstraintEvaluator.lo -MD -MP -MF $(DEPDIR)/libdap_la-ConstraintEvaluator.Tpo -c -o libdap_la-ConstraintEvaluator.lo `test -f 'ConstraintEvaluator.cc' || echo '$(srcdir)/'`ConstraintEvaluator.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-ConstraintEvaluator.Tpo $(DEPDIR)/libdap_la-ConstraintEvaluator.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ConstraintEvaluator.cc' object='libdap_la-ConstraintEvaluator.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ConstraintEvaluator.lo `test -f 'ConstraintEvaluator.cc' || echo '$(srcdir)/'`ConstraintEvaluator.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ConstraintEvaluator.lo `test -f 'ConstraintEvaluator.cc' || echo '$(srcdir)/'`ConstraintEvaluator.cc
libdap_la-DapIndent.lo: DapIndent.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DapIndent.lo -MD -MP -MF $(DEPDIR)/libdap_la-DapIndent.Tpo -c -o libdap_la-DapIndent.lo `test -f 'DapIndent.cc' || echo '$(srcdir)/'`DapIndent.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-DapIndent.Tpo $(DEPDIR)/libdap_la-DapIndent.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DapIndent.cc' object='libdap_la-DapIndent.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DapIndent.lo -MD -MP -MF $(DEPDIR)/libdap_la-DapIndent.Tpo -c -o libdap_la-DapIndent.lo `test -f 'DapIndent.cc' || echo '$(srcdir)/'`DapIndent.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DapIndent.Tpo $(DEPDIR)/libdap_la-DapIndent.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DapIndent.cc' object='libdap_la-DapIndent.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DapIndent.lo `test -f 'DapIndent.cc' || echo '$(srcdir)/'`DapIndent.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DapIndent.lo `test -f 'DapIndent.cc' || echo '$(srcdir)/'`DapIndent.cc
libdap_la-XDRUtils.lo: XDRUtils.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRUtils.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRUtils.Tpo -c -o libdap_la-XDRUtils.lo `test -f 'XDRUtils.cc' || echo '$(srcdir)/'`XDRUtils.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-XDRUtils.Tpo $(DEPDIR)/libdap_la-XDRUtils.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='XDRUtils.cc' object='libdap_la-XDRUtils.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRUtils.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRUtils.Tpo -c -o libdap_la-XDRUtils.lo `test -f 'XDRUtils.cc' || echo '$(srcdir)/'`XDRUtils.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRUtils.Tpo $(DEPDIR)/libdap_la-XDRUtils.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XDRUtils.cc' object='libdap_la-XDRUtils.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRUtils.lo `test -f 'XDRUtils.cc' || echo '$(srcdir)/'`XDRUtils.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRUtils.lo `test -f 'XDRUtils.cc' || echo '$(srcdir)/'`XDRUtils.cc
libdap_la-XDRFileMarshaller.lo: XDRFileMarshaller.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRFileMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRFileMarshaller.Tpo -c -o libdap_la-XDRFileMarshaller.lo `test -f 'XDRFileMarshaller.cc' || echo '$(srcdir)/'`XDRFileMarshaller.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-XDRFileMarshaller.Tpo $(DEPDIR)/libdap_la-XDRFileMarshaller.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='XDRFileMarshaller.cc' object='libdap_la-XDRFileMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRFileMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRFileMarshaller.Tpo -c -o libdap_la-XDRFileMarshaller.lo `test -f 'XDRFileMarshaller.cc' || echo '$(srcdir)/'`XDRFileMarshaller.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRFileMarshaller.Tpo $(DEPDIR)/libdap_la-XDRFileMarshaller.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XDRFileMarshaller.cc' object='libdap_la-XDRFileMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRFileMarshaller.lo `test -f 'XDRFileMarshaller.cc' || echo '$(srcdir)/'`XDRFileMarshaller.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRFileMarshaller.lo `test -f 'XDRFileMarshaller.cc' || echo '$(srcdir)/'`XDRFileMarshaller.cc
libdap_la-XDRStreamMarshaller.lo: XDRStreamMarshaller.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRStreamMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRStreamMarshaller.Tpo -c -o libdap_la-XDRStreamMarshaller.lo `test -f 'XDRStreamMarshaller.cc' || echo '$(srcdir)/'`XDRStreamMarshaller.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-XDRStreamMarshaller.Tpo $(DEPDIR)/libdap_la-XDRStreamMarshaller.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='XDRStreamMarshaller.cc' object='libdap_la-XDRStreamMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRStreamMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRStreamMarshaller.Tpo -c -o libdap_la-XDRStreamMarshaller.lo `test -f 'XDRStreamMarshaller.cc' || echo '$(srcdir)/'`XDRStreamMarshaller.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRStreamMarshaller.Tpo $(DEPDIR)/libdap_la-XDRStreamMarshaller.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XDRStreamMarshaller.cc' object='libdap_la-XDRStreamMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRStreamMarshaller.lo `test -f 'XDRStreamMarshaller.cc' || echo '$(srcdir)/'`XDRStreamMarshaller.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRStreamMarshaller.lo `test -f 'XDRStreamMarshaller.cc' || echo '$(srcdir)/'`XDRStreamMarshaller.cc
libdap_la-XDRFileUnMarshaller.lo: XDRFileUnMarshaller.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRFileUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Tpo -c -o libdap_la-XDRFileUnMarshaller.lo `test -f 'XDRFileUnMarshaller.cc' || echo '$(srcdir)/'`XDRFileUnMarshaller.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Tpo $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='XDRFileUnMarshaller.cc' object='libdap_la-XDRFileUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRFileUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Tpo -c -o libdap_la-XDRFileUnMarshaller.lo `test -f 'XDRFileUnMarshaller.cc' || echo '$(srcdir)/'`XDRFileUnMarshaller.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Tpo $(DEPDIR)/libdap_la-XDRFileUnMarshaller.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XDRFileUnMarshaller.cc' object='libdap_la-XDRFileUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRFileUnMarshaller.lo `test -f 'XDRFileUnMarshaller.cc' || echo '$(srcdir)/'`XDRFileUnMarshaller.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRFileUnMarshaller.lo `test -f 'XDRFileUnMarshaller.cc' || echo '$(srcdir)/'`XDRFileUnMarshaller.cc
libdap_la-XDRStreamUnMarshaller.lo: XDRStreamUnMarshaller.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRStreamUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Tpo -c -o libdap_la-XDRStreamUnMarshaller.lo `test -f 'XDRStreamUnMarshaller.cc' || echo '$(srcdir)/'`XDRStreamUnMarshaller.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Tpo $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='XDRStreamUnMarshaller.cc' object='libdap_la-XDRStreamUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XDRStreamUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Tpo -c -o libdap_la-XDRStreamUnMarshaller.lo `test -f 'XDRStreamUnMarshaller.cc' || echo '$(srcdir)/'`XDRStreamUnMarshaller.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Tpo $(DEPDIR)/libdap_la-XDRStreamUnMarshaller.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XDRStreamUnMarshaller.cc' object='libdap_la-XDRStreamUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRStreamUnMarshaller.lo `test -f 'XDRStreamUnMarshaller.cc' || echo '$(srcdir)/'`XDRStreamUnMarshaller.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XDRStreamUnMarshaller.lo `test -f 'XDRStreamUnMarshaller.cc' || echo '$(srcdir)/'`XDRStreamUnMarshaller.cc
libdap_la-mime_util.lo: mime_util.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-mime_util.lo -MD -MP -MF $(DEPDIR)/libdap_la-mime_util.Tpo -c -o libdap_la-mime_util.lo `test -f 'mime_util.cc' || echo '$(srcdir)/'`mime_util.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-mime_util.Tpo $(DEPDIR)/libdap_la-mime_util.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mime_util.cc' object='libdap_la-mime_util.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-mime_util.lo -MD -MP -MF $(DEPDIR)/libdap_la-mime_util.Tpo -c -o libdap_la-mime_util.lo `test -f 'mime_util.cc' || echo '$(srcdir)/'`mime_util.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-mime_util.Tpo $(DEPDIR)/libdap_la-mime_util.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='mime_util.cc' object='libdap_la-mime_util.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-mime_util.lo `test -f 'mime_util.cc' || echo '$(srcdir)/'`mime_util.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-mime_util.lo `test -f 'mime_util.cc' || echo '$(srcdir)/'`mime_util.cc
libdap_la-Keywords2.lo: Keywords2.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Keywords2.lo -MD -MP -MF $(DEPDIR)/libdap_la-Keywords2.Tpo -c -o libdap_la-Keywords2.lo `test -f 'Keywords2.cc' || echo '$(srcdir)/'`Keywords2.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Keywords2.Tpo $(DEPDIR)/libdap_la-Keywords2.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Keywords2.cc' object='libdap_la-Keywords2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Keywords2.lo -MD -MP -MF $(DEPDIR)/libdap_la-Keywords2.Tpo -c -o libdap_la-Keywords2.lo `test -f 'Keywords2.cc' || echo '$(srcdir)/'`Keywords2.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Keywords2.Tpo $(DEPDIR)/libdap_la-Keywords2.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Keywords2.cc' object='libdap_la-Keywords2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Keywords2.lo `test -f 'Keywords2.cc' || echo '$(srcdir)/'`Keywords2.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Keywords2.lo `test -f 'Keywords2.cc' || echo '$(srcdir)/'`Keywords2.cc
libdap_la-XMLWriter.lo: XMLWriter.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XMLWriter.lo -MD -MP -MF $(DEPDIR)/libdap_la-XMLWriter.Tpo -c -o libdap_la-XMLWriter.lo `test -f 'XMLWriter.cc' || echo '$(srcdir)/'`XMLWriter.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-XMLWriter.Tpo $(DEPDIR)/libdap_la-XMLWriter.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='XMLWriter.cc' object='libdap_la-XMLWriter.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-XMLWriter.lo -MD -MP -MF $(DEPDIR)/libdap_la-XMLWriter.Tpo -c -o libdap_la-XMLWriter.lo `test -f 'XMLWriter.cc' || echo '$(srcdir)/'`XMLWriter.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-XMLWriter.Tpo $(DEPDIR)/libdap_la-XMLWriter.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XMLWriter.cc' object='libdap_la-XMLWriter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XMLWriter.lo `test -f 'XMLWriter.cc' || echo '$(srcdir)/'`XMLWriter.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-XMLWriter.lo `test -f 'XMLWriter.cc' || echo '$(srcdir)/'`XMLWriter.cc
libdap_la-ServerFunctionsList.lo: ServerFunctionsList.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ServerFunctionsList.lo -MD -MP -MF $(DEPDIR)/libdap_la-ServerFunctionsList.Tpo -c -o libdap_la-ServerFunctionsList.lo `test -f 'ServerFunctionsList.cc' || echo '$(srcdir)/'`ServerFunctionsList.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-ServerFunctionsList.Tpo $(DEPDIR)/libdap_la-ServerFunctionsList.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ServerFunctionsList.cc' object='libdap_la-ServerFunctionsList.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ServerFunctionsList.lo -MD -MP -MF $(DEPDIR)/libdap_la-ServerFunctionsList.Tpo -c -o libdap_la-ServerFunctionsList.lo `test -f 'ServerFunctionsList.cc' || echo '$(srcdir)/'`ServerFunctionsList.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-ServerFunctionsList.Tpo $(DEPDIR)/libdap_la-ServerFunctionsList.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ServerFunctionsList.cc' object='libdap_la-ServerFunctionsList.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ServerFunctionsList.lo `test -f 'ServerFunctionsList.cc' || echo '$(srcdir)/'`ServerFunctionsList.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ServerFunctionsList.lo `test -f 'ServerFunctionsList.cc' || echo '$(srcdir)/'`ServerFunctionsList.cc
libdap_la-ServerFunction.lo: ServerFunction.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ServerFunction.lo -MD -MP -MF $(DEPDIR)/libdap_la-ServerFunction.Tpo -c -o libdap_la-ServerFunction.lo `test -f 'ServerFunction.cc' || echo '$(srcdir)/'`ServerFunction.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-ServerFunction.Tpo $(DEPDIR)/libdap_la-ServerFunction.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ServerFunction.cc' object='libdap_la-ServerFunction.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-ServerFunction.lo -MD -MP -MF $(DEPDIR)/libdap_la-ServerFunction.Tpo -c -o libdap_la-ServerFunction.lo `test -f 'ServerFunction.cc' || echo '$(srcdir)/'`ServerFunction.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-ServerFunction.Tpo $(DEPDIR)/libdap_la-ServerFunction.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ServerFunction.cc' object='libdap_la-ServerFunction.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ServerFunction.lo `test -f 'ServerFunction.cc' || echo '$(srcdir)/'`ServerFunction.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-ServerFunction.lo `test -f 'ServerFunction.cc' || echo '$(srcdir)/'`ServerFunction.cc
libdap_la-DapXmlNamespaces.lo: DapXmlNamespaces.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DapXmlNamespaces.lo -MD -MP -MF $(DEPDIR)/libdap_la-DapXmlNamespaces.Tpo -c -o libdap_la-DapXmlNamespaces.lo `test -f 'DapXmlNamespaces.cc' || echo '$(srcdir)/'`DapXmlNamespaces.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-DapXmlNamespaces.Tpo $(DEPDIR)/libdap_la-DapXmlNamespaces.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DapXmlNamespaces.cc' object='libdap_la-DapXmlNamespaces.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DapXmlNamespaces.lo -MD -MP -MF $(DEPDIR)/libdap_la-DapXmlNamespaces.Tpo -c -o libdap_la-DapXmlNamespaces.lo `test -f 'DapXmlNamespaces.cc' || echo '$(srcdir)/'`DapXmlNamespaces.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DapXmlNamespaces.Tpo $(DEPDIR)/libdap_la-DapXmlNamespaces.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DapXmlNamespaces.cc' object='libdap_la-DapXmlNamespaces.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DapXmlNamespaces.lo `test -f 'DapXmlNamespaces.cc' || echo '$(srcdir)/'`DapXmlNamespaces.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DapXmlNamespaces.lo `test -f 'DapXmlNamespaces.cc' || echo '$(srcdir)/'`DapXmlNamespaces.cc
libdap_la-MarshallerThread.lo: MarshallerThread.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-MarshallerThread.lo -MD -MP -MF $(DEPDIR)/libdap_la-MarshallerThread.Tpo -c -o libdap_la-MarshallerThread.lo `test -f 'MarshallerThread.cc' || echo '$(srcdir)/'`MarshallerThread.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-MarshallerThread.Tpo $(DEPDIR)/libdap_la-MarshallerThread.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='MarshallerThread.cc' object='libdap_la-MarshallerThread.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-MarshallerThread.lo -MD -MP -MF $(DEPDIR)/libdap_la-MarshallerThread.Tpo -c -o libdap_la-MarshallerThread.lo `test -f 'MarshallerThread.cc' || echo '$(srcdir)/'`MarshallerThread.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-MarshallerThread.Tpo $(DEPDIR)/libdap_la-MarshallerThread.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='MarshallerThread.cc' object='libdap_la-MarshallerThread.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-MarshallerThread.lo `test -f 'MarshallerThread.cc' || echo '$(srcdir)/'`MarshallerThread.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-MarshallerThread.lo `test -f 'MarshallerThread.cc' || echo '$(srcdir)/'`MarshallerThread.cc
GNU/libdap_la-GetOpt.lo: GNU/GetOpt.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GNU/libdap_la-GetOpt.lo -MD -MP -MF GNU/$(DEPDIR)/libdap_la-GetOpt.Tpo -c -o GNU/libdap_la-GetOpt.lo `test -f 'GNU/GetOpt.cc' || echo '$(srcdir)/'`GNU/GetOpt.cc
- at am__fastdepCXX_TRUE@ $(am__mv) GNU/$(DEPDIR)/libdap_la-GetOpt.Tpo GNU/$(DEPDIR)/libdap_la-GetOpt.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='GNU/GetOpt.cc' object='GNU/libdap_la-GetOpt.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GNU/libdap_la-GetOpt.lo -MD -MP -MF GNU/$(DEPDIR)/libdap_la-GetOpt.Tpo -c -o GNU/libdap_la-GetOpt.lo `test -f 'GNU/GetOpt.cc' || echo '$(srcdir)/'`GNU/GetOpt.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) GNU/$(DEPDIR)/libdap_la-GetOpt.Tpo GNU/$(DEPDIR)/libdap_la-GetOpt.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='GNU/GetOpt.cc' object='GNU/libdap_la-GetOpt.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GNU/libdap_la-GetOpt.lo `test -f 'GNU/GetOpt.cc' || echo '$(srcdir)/'`GNU/GetOpt.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GNU/libdap_la-GetOpt.lo `test -f 'GNU/GetOpt.cc' || echo '$(srcdir)/'`GNU/GetOpt.cc
GNU/libdap_la-GNURegex.lo: GNU/GNURegex.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GNU/libdap_la-GNURegex.lo -MD -MP -MF GNU/$(DEPDIR)/libdap_la-GNURegex.Tpo -c -o GNU/libdap_la-GNURegex.lo `test -f 'GNU/GNURegex.cc' || echo '$(srcdir)/'`GNU/GNURegex.cc
- at am__fastdepCXX_TRUE@ $(am__mv) GNU/$(DEPDIR)/libdap_la-GNURegex.Tpo GNU/$(DEPDIR)/libdap_la-GNURegex.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='GNU/GNURegex.cc' object='GNU/libdap_la-GNURegex.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GNU/libdap_la-GNURegex.lo -MD -MP -MF GNU/$(DEPDIR)/libdap_la-GNURegex.Tpo -c -o GNU/libdap_la-GNURegex.lo `test -f 'GNU/GNURegex.cc' || echo '$(srcdir)/'`GNU/GNURegex.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) GNU/$(DEPDIR)/libdap_la-GNURegex.Tpo GNU/$(DEPDIR)/libdap_la-GNURegex.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='GNU/GNURegex.cc' object='GNU/libdap_la-GNURegex.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GNU/libdap_la-GNURegex.lo `test -f 'GNU/GNURegex.cc' || echo '$(srcdir)/'`GNU/GNURegex.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GNU/libdap_la-GNURegex.lo `test -f 'GNU/GNURegex.cc' || echo '$(srcdir)/'`GNU/GNURegex.cc
libdap_la-D4StreamMarshaller.lo: D4StreamMarshaller.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4StreamMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4StreamMarshaller.Tpo -c -o libdap_la-D4StreamMarshaller.lo `test -f 'D4StreamMarshaller.cc' || echo '$(srcdir)/'`D4StreamMarshaller.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4StreamMarshaller.Tpo $(DEPDIR)/libdap_la-D4StreamMarshaller.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4StreamMarshaller.cc' object='libdap_la-D4StreamMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4StreamMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4StreamMarshaller.Tpo -c -o libdap_la-D4StreamMarshaller.lo `test -f 'D4StreamMarshaller.cc' || echo '$(srcdir)/'`D4StreamMarshaller.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4StreamMarshaller.Tpo $(DEPDIR)/libdap_la-D4StreamMarshaller.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4StreamMarshaller.cc' object='libdap_la-D4StreamMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4StreamMarshaller.lo `test -f 'D4StreamMarshaller.cc' || echo '$(srcdir)/'`D4StreamMarshaller.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4StreamMarshaller.lo `test -f 'D4StreamMarshaller.cc' || echo '$(srcdir)/'`D4StreamMarshaller.cc
libdap_la-D4StreamUnMarshaller.lo: D4StreamUnMarshaller.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4StreamUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Tpo -c -o libdap_la-D4StreamUnMarshaller.lo `test -f 'D4StreamUnMarshaller.cc' || echo '$(srcdir)/'`D4StreamUnMarshaller.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Tpo $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4StreamUnMarshaller.cc' object='libdap_la-D4StreamUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4StreamUnMarshaller.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Tpo -c -o libdap_la-D4StreamUnMarshaller.lo `test -f 'D4StreamUnMarshaller.cc' || echo '$(srcdir)/'`D4StreamUnMarshaller.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Tpo $(DEPDIR)/libdap_la-D4StreamUnMarshaller.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4StreamUnMarshaller.cc' object='libdap_la-D4StreamUnMarshaller.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4StreamUnMarshaller.lo `test -f 'D4StreamUnMarshaller.cc' || echo '$(srcdir)/'`D4StreamUnMarshaller.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4StreamUnMarshaller.lo `test -f 'D4StreamUnMarshaller.cc' || echo '$(srcdir)/'`D4StreamUnMarshaller.cc
libdap_la-Int64.lo: Int64.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int64.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int64.Tpo -c -o libdap_la-Int64.lo `test -f 'Int64.cc' || echo '$(srcdir)/'`Int64.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Int64.Tpo $(DEPDIR)/libdap_la-Int64.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Int64.cc' object='libdap_la-Int64.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int64.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int64.Tpo -c -o libdap_la-Int64.lo `test -f 'Int64.cc' || echo '$(srcdir)/'`Int64.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Int64.Tpo $(DEPDIR)/libdap_la-Int64.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Int64.cc' object='libdap_la-Int64.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int64.lo `test -f 'Int64.cc' || echo '$(srcdir)/'`Int64.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int64.lo `test -f 'Int64.cc' || echo '$(srcdir)/'`Int64.cc
libdap_la-UInt64.lo: UInt64.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt64.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt64.Tpo -c -o libdap_la-UInt64.lo `test -f 'UInt64.cc' || echo '$(srcdir)/'`UInt64.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-UInt64.Tpo $(DEPDIR)/libdap_la-UInt64.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='UInt64.cc' object='libdap_la-UInt64.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-UInt64.lo -MD -MP -MF $(DEPDIR)/libdap_la-UInt64.Tpo -c -o libdap_la-UInt64.lo `test -f 'UInt64.cc' || echo '$(srcdir)/'`UInt64.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-UInt64.Tpo $(DEPDIR)/libdap_la-UInt64.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='UInt64.cc' object='libdap_la-UInt64.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt64.lo `test -f 'UInt64.cc' || echo '$(srcdir)/'`UInt64.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-UInt64.lo `test -f 'UInt64.cc' || echo '$(srcdir)/'`UInt64.cc
libdap_la-Int8.lo: Int8.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int8.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int8.Tpo -c -o libdap_la-Int8.lo `test -f 'Int8.cc' || echo '$(srcdir)/'`Int8.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-Int8.Tpo $(DEPDIR)/libdap_la-Int8.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Int8.cc' object='libdap_la-Int8.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-Int8.lo -MD -MP -MF $(DEPDIR)/libdap_la-Int8.Tpo -c -o libdap_la-Int8.lo `test -f 'Int8.cc' || echo '$(srcdir)/'`Int8.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-Int8.Tpo $(DEPDIR)/libdap_la-Int8.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Int8.cc' object='libdap_la-Int8.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int8.lo `test -f 'Int8.cc' || echo '$(srcdir)/'`Int8.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-Int8.lo `test -f 'Int8.cc' || echo '$(srcdir)/'`Int8.cc
libdap_la-D4ParserSax2.lo: D4ParserSax2.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4ParserSax2.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4ParserSax2.Tpo -c -o libdap_la-D4ParserSax2.lo `test -f 'D4ParserSax2.cc' || echo '$(srcdir)/'`D4ParserSax2.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4ParserSax2.Tpo $(DEPDIR)/libdap_la-D4ParserSax2.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4ParserSax2.cc' object='libdap_la-D4ParserSax2.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4ParserSax2.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4ParserSax2.Tpo -c -o libdap_la-D4ParserSax2.lo `test -f 'D4ParserSax2.cc' || echo '$(srcdir)/'`D4ParserSax2.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4ParserSax2.Tpo $(DEPDIR)/libdap_la-D4ParserSax2.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4ParserSax2.cc' object='libdap_la-D4ParserSax2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4ParserSax2.lo `test -f 'D4ParserSax2.cc' || echo '$(srcdir)/'`D4ParserSax2.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4ParserSax2.lo `test -f 'D4ParserSax2.cc' || echo '$(srcdir)/'`D4ParserSax2.cc
libdap_la-D4BaseTypeFactory.lo: D4BaseTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4BaseTypeFactory.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4BaseTypeFactory.Tpo -c -o libdap_la-D4BaseTypeFactory.lo `test -f 'D4BaseTypeFactory.cc' || echo '$(srcdir)/'`D4BaseTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4BaseTypeFactory.Tpo $(DEPDIR)/libdap_la-D4BaseTypeFactory.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4BaseTypeFactory.cc' object='libdap_la-D4BaseTypeFactory.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4BaseTypeFactory.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4BaseTypeFactory.Tpo -c -o libdap_la-D4BaseTypeFactory.lo `test -f 'D4BaseTypeFactory.cc' || echo '$(srcdir)/'`D4BaseTypeFactory.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4BaseTypeFactory.Tpo $(DEPDIR)/libdap_la-D4BaseTypeFactory.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4BaseTypeFactory.cc' object='libdap_la-D4BaseTypeFactory.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4BaseTypeFactory.lo `test -f 'D4BaseTypeFactory.cc' || echo '$(srcdir)/'`D4BaseTypeFactory.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4BaseTypeFactory.lo `test -f 'D4BaseTypeFactory.cc' || echo '$(srcdir)/'`D4BaseTypeFactory.cc
libdap_la-D4Dimensions.lo: D4Dimensions.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Dimensions.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Dimensions.Tpo -c -o libdap_la-D4Dimensions.lo `test -f 'D4Dimensions.cc' || echo '$(srcdir)/'`D4Dimensions.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4Dimensions.Tpo $(DEPDIR)/libdap_la-D4Dimensions.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4Dimensions.cc' object='libdap_la-D4Dimensions.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Dimensions.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Dimensions.Tpo -c -o libdap_la-D4Dimensions.lo `test -f 'D4Dimensions.cc' || echo '$(srcdir)/'`D4Dimensions.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Dimensions.Tpo $(DEPDIR)/libdap_la-D4Dimensions.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4Dimensions.cc' object='libdap_la-D4Dimensions.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Dimensions.lo `test -f 'D4Dimensions.cc' || echo '$(srcdir)/'`D4Dimensions.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Dimensions.lo `test -f 'D4Dimensions.cc' || echo '$(srcdir)/'`D4Dimensions.cc
libdap_la-D4EnumDefs.lo: D4EnumDefs.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4EnumDefs.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4EnumDefs.Tpo -c -o libdap_la-D4EnumDefs.lo `test -f 'D4EnumDefs.cc' || echo '$(srcdir)/'`D4EnumDefs.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4EnumDefs.Tpo $(DEPDIR)/libdap_la-D4EnumDefs.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4EnumDefs.cc' object='libdap_la-D4EnumDefs.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4EnumDefs.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4EnumDefs.Tpo -c -o libdap_la-D4EnumDefs.lo `test -f 'D4EnumDefs.cc' || echo '$(srcdir)/'`D4EnumDefs.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4EnumDefs.Tpo $(DEPDIR)/libdap_la-D4EnumDefs.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4EnumDefs.cc' object='libdap_la-D4EnumDefs.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4EnumDefs.lo `test -f 'D4EnumDefs.cc' || echo '$(srcdir)/'`D4EnumDefs.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4EnumDefs.lo `test -f 'D4EnumDefs.cc' || echo '$(srcdir)/'`D4EnumDefs.cc
libdap_la-D4Group.lo: D4Group.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Group.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Group.Tpo -c -o libdap_la-D4Group.lo `test -f 'D4Group.cc' || echo '$(srcdir)/'`D4Group.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4Group.Tpo $(DEPDIR)/libdap_la-D4Group.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4Group.cc' object='libdap_la-D4Group.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Group.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Group.Tpo -c -o libdap_la-D4Group.lo `test -f 'D4Group.cc' || echo '$(srcdir)/'`D4Group.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Group.Tpo $(DEPDIR)/libdap_la-D4Group.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4Group.cc' object='libdap_la-D4Group.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Group.lo `test -f 'D4Group.cc' || echo '$(srcdir)/'`D4Group.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Group.lo `test -f 'D4Group.cc' || echo '$(srcdir)/'`D4Group.cc
libdap_la-DMR.lo: DMR.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DMR.lo -MD -MP -MF $(DEPDIR)/libdap_la-DMR.Tpo -c -o libdap_la-DMR.lo `test -f 'DMR.cc' || echo '$(srcdir)/'`DMR.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-DMR.Tpo $(DEPDIR)/libdap_la-DMR.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DMR.cc' object='libdap_la-DMR.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-DMR.lo -MD -MP -MF $(DEPDIR)/libdap_la-DMR.Tpo -c -o libdap_la-DMR.lo `test -f 'DMR.cc' || echo '$(srcdir)/'`DMR.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-DMR.Tpo $(DEPDIR)/libdap_la-DMR.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DMR.cc' object='libdap_la-DMR.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DMR.lo `test -f 'DMR.cc' || echo '$(srcdir)/'`DMR.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-DMR.lo `test -f 'DMR.cc' || echo '$(srcdir)/'`DMR.cc
libdap_la-D4Attributes.lo: D4Attributes.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Attributes.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Attributes.Tpo -c -o libdap_la-D4Attributes.lo `test -f 'D4Attributes.cc' || echo '$(srcdir)/'`D4Attributes.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4Attributes.Tpo $(DEPDIR)/libdap_la-D4Attributes.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4Attributes.cc' object='libdap_la-D4Attributes.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Attributes.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Attributes.Tpo -c -o libdap_la-D4Attributes.lo `test -f 'D4Attributes.cc' || echo '$(srcdir)/'`D4Attributes.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Attributes.Tpo $(DEPDIR)/libdap_la-D4Attributes.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4Attributes.cc' object='libdap_la-D4Attributes.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Attributes.lo `test -f 'D4Attributes.cc' || echo '$(srcdir)/'`D4Attributes.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Attributes.lo `test -f 'D4Attributes.cc' || echo '$(srcdir)/'`D4Attributes.cc
libdap_la-D4Enum.lo: D4Enum.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Enum.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Enum.Tpo -c -o libdap_la-D4Enum.lo `test -f 'D4Enum.cc' || echo '$(srcdir)/'`D4Enum.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4Enum.Tpo $(DEPDIR)/libdap_la-D4Enum.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4Enum.cc' object='libdap_la-D4Enum.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Enum.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Enum.Tpo -c -o libdap_la-D4Enum.lo `test -f 'D4Enum.cc' || echo '$(srcdir)/'`D4Enum.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Enum.Tpo $(DEPDIR)/libdap_la-D4Enum.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4Enum.cc' object='libdap_la-D4Enum.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Enum.lo `test -f 'D4Enum.cc' || echo '$(srcdir)/'`D4Enum.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Enum.lo `test -f 'D4Enum.cc' || echo '$(srcdir)/'`D4Enum.cc
libdap_la-chunked_ostream.lo: chunked_ostream.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-chunked_ostream.lo -MD -MP -MF $(DEPDIR)/libdap_la-chunked_ostream.Tpo -c -o libdap_la-chunked_ostream.lo `test -f 'chunked_ostream.cc' || echo '$(srcdir)/'`chunked_ostream.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-chunked_ostream.Tpo $(DEPDIR)/libdap_la-chunked_ostream.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='chunked_ostream.cc' object='libdap_la-chunked_ostream.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-chunked_ostream.lo -MD -MP -MF $(DEPDIR)/libdap_la-chunked_ostream.Tpo -c -o libdap_la-chunked_ostream.lo `test -f 'chunked_ostream.cc' || echo '$(srcdir)/'`chunked_ostream.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-chunked_ostream.Tpo $(DEPDIR)/libdap_la-chunked_ostream.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='chunked_ostream.cc' object='libdap_la-chunked_ostream.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-chunked_ostream.lo `test -f 'chunked_ostream.cc' || echo '$(srcdir)/'`chunked_ostream.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-chunked_ostream.lo `test -f 'chunked_ostream.cc' || echo '$(srcdir)/'`chunked_ostream.cc
libdap_la-chunked_istream.lo: chunked_istream.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-chunked_istream.lo -MD -MP -MF $(DEPDIR)/libdap_la-chunked_istream.Tpo -c -o libdap_la-chunked_istream.lo `test -f 'chunked_istream.cc' || echo '$(srcdir)/'`chunked_istream.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-chunked_istream.Tpo $(DEPDIR)/libdap_la-chunked_istream.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='chunked_istream.cc' object='libdap_la-chunked_istream.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-chunked_istream.lo -MD -MP -MF $(DEPDIR)/libdap_la-chunked_istream.Tpo -c -o libdap_la-chunked_istream.lo `test -f 'chunked_istream.cc' || echo '$(srcdir)/'`chunked_istream.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-chunked_istream.Tpo $(DEPDIR)/libdap_la-chunked_istream.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='chunked_istream.cc' object='libdap_la-chunked_istream.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-chunked_istream.lo `test -f 'chunked_istream.cc' || echo '$(srcdir)/'`chunked_istream.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-chunked_istream.lo `test -f 'chunked_istream.cc' || echo '$(srcdir)/'`chunked_istream.cc
libdap_la-D4Sequence.lo: D4Sequence.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Sequence.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Sequence.Tpo -c -o libdap_la-D4Sequence.lo `test -f 'D4Sequence.cc' || echo '$(srcdir)/'`D4Sequence.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4Sequence.Tpo $(DEPDIR)/libdap_la-D4Sequence.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4Sequence.cc' object='libdap_la-D4Sequence.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Sequence.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Sequence.Tpo -c -o libdap_la-D4Sequence.lo `test -f 'D4Sequence.cc' || echo '$(srcdir)/'`D4Sequence.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Sequence.Tpo $(DEPDIR)/libdap_la-D4Sequence.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4Sequence.cc' object='libdap_la-D4Sequence.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Sequence.lo `test -f 'D4Sequence.cc' || echo '$(srcdir)/'`D4Sequence.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Sequence.lo `test -f 'D4Sequence.cc' || echo '$(srcdir)/'`D4Sequence.cc
libdap_la-D4Maps.lo: D4Maps.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Maps.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Maps.Tpo -c -o libdap_la-D4Maps.lo `test -f 'D4Maps.cc' || echo '$(srcdir)/'`D4Maps.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4Maps.Tpo $(DEPDIR)/libdap_la-D4Maps.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4Maps.cc' object='libdap_la-D4Maps.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Maps.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Maps.Tpo -c -o libdap_la-D4Maps.lo `test -f 'D4Maps.cc' || echo '$(srcdir)/'`D4Maps.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Maps.Tpo $(DEPDIR)/libdap_la-D4Maps.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4Maps.cc' object='libdap_la-D4Maps.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Maps.lo `test -f 'D4Maps.cc' || echo '$(srcdir)/'`D4Maps.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Maps.lo `test -f 'D4Maps.cc' || echo '$(srcdir)/'`D4Maps.cc
libdap_la-D4Opaque.lo: D4Opaque.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Opaque.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Opaque.Tpo -c -o libdap_la-D4Opaque.lo `test -f 'D4Opaque.cc' || echo '$(srcdir)/'`D4Opaque.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4Opaque.Tpo $(DEPDIR)/libdap_la-D4Opaque.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4Opaque.cc' object='libdap_la-D4Opaque.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4Opaque.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4Opaque.Tpo -c -o libdap_la-D4Opaque.lo `test -f 'D4Opaque.cc' || echo '$(srcdir)/'`D4Opaque.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4Opaque.Tpo $(DEPDIR)/libdap_la-D4Opaque.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4Opaque.cc' object='libdap_la-D4Opaque.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Opaque.lo `test -f 'D4Opaque.cc' || echo '$(srcdir)/'`D4Opaque.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4Opaque.lo `test -f 'D4Opaque.cc' || echo '$(srcdir)/'`D4Opaque.cc
libdap_la-D4AsyncUtil.lo: D4AsyncUtil.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4AsyncUtil.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4AsyncUtil.Tpo -c -o libdap_la-D4AsyncUtil.lo `test -f 'D4AsyncUtil.cc' || echo '$(srcdir)/'`D4AsyncUtil.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4AsyncUtil.Tpo $(DEPDIR)/libdap_la-D4AsyncUtil.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4AsyncUtil.cc' object='libdap_la-D4AsyncUtil.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4AsyncUtil.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4AsyncUtil.Tpo -c -o libdap_la-D4AsyncUtil.lo `test -f 'D4AsyncUtil.cc' || echo '$(srcdir)/'`D4AsyncUtil.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4AsyncUtil.Tpo $(DEPDIR)/libdap_la-D4AsyncUtil.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4AsyncUtil.cc' object='libdap_la-D4AsyncUtil.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4AsyncUtil.lo `test -f 'D4AsyncUtil.cc' || echo '$(srcdir)/'`D4AsyncUtil.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4AsyncUtil.lo `test -f 'D4AsyncUtil.cc' || echo '$(srcdir)/'`D4AsyncUtil.cc
libdap_la-D4RValue.lo: D4RValue.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4RValue.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4RValue.Tpo -c -o libdap_la-D4RValue.lo `test -f 'D4RValue.cc' || echo '$(srcdir)/'`D4RValue.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4RValue.Tpo $(DEPDIR)/libdap_la-D4RValue.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4RValue.cc' object='libdap_la-D4RValue.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4RValue.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4RValue.Tpo -c -o libdap_la-D4RValue.lo `test -f 'D4RValue.cc' || echo '$(srcdir)/'`D4RValue.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4RValue.Tpo $(DEPDIR)/libdap_la-D4RValue.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4RValue.cc' object='libdap_la-D4RValue.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4RValue.lo `test -f 'D4RValue.cc' || echo '$(srcdir)/'`D4RValue.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4RValue.lo `test -f 'D4RValue.cc' || echo '$(srcdir)/'`D4RValue.cc
libdap_la-D4FilterClause.lo: D4FilterClause.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4FilterClause.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4FilterClause.Tpo -c -o libdap_la-D4FilterClause.lo `test -f 'D4FilterClause.cc' || echo '$(srcdir)/'`D4FilterClause.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdap_la-D4FilterClause.Tpo $(DEPDIR)/libdap_la-D4FilterClause.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4FilterClause.cc' object='libdap_la-D4FilterClause.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdap_la-D4FilterClause.lo -MD -MP -MF $(DEPDIR)/libdap_la-D4FilterClause.Tpo -c -o libdap_la-D4FilterClause.lo `test -f 'D4FilterClause.cc' || echo '$(srcdir)/'`D4FilterClause.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdap_la-D4FilterClause.Tpo $(DEPDIR)/libdap_la-D4FilterClause.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4FilterClause.cc' object='libdap_la-D4FilterClause.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4FilterClause.lo `test -f 'D4FilterClause.cc' || echo '$(srcdir)/'`D4FilterClause.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdap_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdap_la-D4FilterClause.lo `test -f 'D4FilterClause.cc' || echo '$(srcdir)/'`D4FilterClause.cc
libdapclient_la-RCReader.lo: RCReader.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-RCReader.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-RCReader.Tpo -c -o libdapclient_la-RCReader.lo `test -f 'RCReader.cc' || echo '$(srcdir)/'`RCReader.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdapclient_la-RCReader.Tpo $(DEPDIR)/libdapclient_la-RCReader.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='RCReader.cc' object='libdapclient_la-RCReader.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-RCReader.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-RCReader.Tpo -c -o libdapclient_la-RCReader.lo `test -f 'RCReader.cc' || echo '$(srcdir)/'`RCReader.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-RCReader.Tpo $(DEPDIR)/libdapclient_la-RCReader.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='RCReader.cc' object='libdapclient_la-RCReader.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-RCReader.lo `test -f 'RCReader.cc' || echo '$(srcdir)/'`RCReader.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-RCReader.lo `test -f 'RCReader.cc' || echo '$(srcdir)/'`RCReader.cc
libdapclient_la-Connect.lo: Connect.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-Connect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-Connect.Tpo -c -o libdapclient_la-Connect.lo `test -f 'Connect.cc' || echo '$(srcdir)/'`Connect.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdapclient_la-Connect.Tpo $(DEPDIR)/libdapclient_la-Connect.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Connect.cc' object='libdapclient_la-Connect.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-Connect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-Connect.Tpo -c -o libdapclient_la-Connect.lo `test -f 'Connect.cc' || echo '$(srcdir)/'`Connect.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-Connect.Tpo $(DEPDIR)/libdapclient_la-Connect.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Connect.cc' object='libdapclient_la-Connect.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-Connect.lo `test -f 'Connect.cc' || echo '$(srcdir)/'`Connect.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-Connect.lo `test -f 'Connect.cc' || echo '$(srcdir)/'`Connect.cc
libdapclient_la-HTTPConnect.lo: HTTPConnect.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPConnect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPConnect.Tpo -c -o libdapclient_la-HTTPConnect.lo `test -f 'HTTPConnect.cc' || echo '$(srcdir)/'`HTTPConnect.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdapclient_la-HTTPConnect.Tpo $(DEPDIR)/libdapclient_la-HTTPConnect.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='HTTPConnect.cc' object='libdapclient_la-HTTPConnect.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPConnect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPConnect.Tpo -c -o libdapclient_la-HTTPConnect.lo `test -f 'HTTPConnect.cc' || echo '$(srcdir)/'`HTTPConnect.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-HTTPConnect.Tpo $(DEPDIR)/libdapclient_la-HTTPConnect.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HTTPConnect.cc' object='libdapclient_la-HTTPConnect.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPConnect.lo `test -f 'HTTPConnect.cc' || echo '$(srcdir)/'`HTTPConnect.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPConnect.lo `test -f 'HTTPConnect.cc' || echo '$(srcdir)/'`HTTPConnect.cc
libdapclient_la-HTTPCache.lo: HTTPCache.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPCache.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPCache.Tpo -c -o libdapclient_la-HTTPCache.lo `test -f 'HTTPCache.cc' || echo '$(srcdir)/'`HTTPCache.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdapclient_la-HTTPCache.Tpo $(DEPDIR)/libdapclient_la-HTTPCache.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='HTTPCache.cc' object='libdapclient_la-HTTPCache.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPCache.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPCache.Tpo -c -o libdapclient_la-HTTPCache.lo `test -f 'HTTPCache.cc' || echo '$(srcdir)/'`HTTPCache.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-HTTPCache.Tpo $(DEPDIR)/libdapclient_la-HTTPCache.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HTTPCache.cc' object='libdapclient_la-HTTPCache.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPCache.lo `test -f 'HTTPCache.cc' || echo '$(srcdir)/'`HTTPCache.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPCache.lo `test -f 'HTTPCache.cc' || echo '$(srcdir)/'`HTTPCache.cc
libdapclient_la-util_mit.lo: util_mit.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-util_mit.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-util_mit.Tpo -c -o libdapclient_la-util_mit.lo `test -f 'util_mit.cc' || echo '$(srcdir)/'`util_mit.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdapclient_la-util_mit.Tpo $(DEPDIR)/libdapclient_la-util_mit.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='util_mit.cc' object='libdapclient_la-util_mit.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-util_mit.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-util_mit.Tpo -c -o libdapclient_la-util_mit.lo `test -f 'util_mit.cc' || echo '$(srcdir)/'`util_mit.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-util_mit.Tpo $(DEPDIR)/libdapclient_la-util_mit.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='util_mit.cc' object='libdapclient_la-util_mit.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-util_mit.lo `test -f 'util_mit.cc' || echo '$(srcdir)/'`util_mit.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-util_mit.lo `test -f 'util_mit.cc' || echo '$(srcdir)/'`util_mit.cc
libdapclient_la-ResponseTooBigErr.lo: ResponseTooBigErr.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-ResponseTooBigErr.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Tpo -c -o libdapclient_la-ResponseTooBigErr.lo `test -f 'ResponseTooBigErr.cc' || echo '$(srcdir)/'`ResponseTooBigErr.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Tpo $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ResponseTooBigErr.cc' object='libdapclient_la-ResponseTooBigErr.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-ResponseTooBigErr.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Tpo -c -o libdapclient_la-ResponseTooBigErr.lo `test -f 'ResponseTooBigErr.cc' || echo '$(srcdir)/'`ResponseTooBigErr.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Tpo $(DEPDIR)/libdapclient_la-ResponseTooBigErr.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ResponseTooBigErr.cc' object='libdapclient_la-ResponseTooBigErr.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-ResponseTooBigErr.lo `test -f 'ResponseTooBigErr.cc' || echo '$(srcdir)/'`ResponseTooBigErr.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-ResponseTooBigErr.lo `test -f 'ResponseTooBigErr.cc' || echo '$(srcdir)/'`ResponseTooBigErr.cc
libdapclient_la-HTTPCacheTable.lo: HTTPCacheTable.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPCacheTable.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPCacheTable.Tpo -c -o libdapclient_la-HTTPCacheTable.lo `test -f 'HTTPCacheTable.cc' || echo '$(srcdir)/'`HTTPCacheTable.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdapclient_la-HTTPCacheTable.Tpo $(DEPDIR)/libdapclient_la-HTTPCacheTable.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='HTTPCacheTable.cc' object='libdapclient_la-HTTPCacheTable.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-HTTPCacheTable.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-HTTPCacheTable.Tpo -c -o libdapclient_la-HTTPCacheTable.lo `test -f 'HTTPCacheTable.cc' || echo '$(srcdir)/'`HTTPCacheTable.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-HTTPCacheTable.Tpo $(DEPDIR)/libdapclient_la-HTTPCacheTable.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HTTPCacheTable.cc' object='libdapclient_la-HTTPCacheTable.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPCacheTable.lo `test -f 'HTTPCacheTable.cc' || echo '$(srcdir)/'`HTTPCacheTable.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-HTTPCacheTable.lo `test -f 'HTTPCacheTable.cc' || echo '$(srcdir)/'`HTTPCacheTable.cc
libdapclient_la-D4Connect.lo: D4Connect.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-D4Connect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-D4Connect.Tpo -c -o libdapclient_la-D4Connect.lo `test -f 'D4Connect.cc' || echo '$(srcdir)/'`D4Connect.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libdapclient_la-D4Connect.Tpo $(DEPDIR)/libdapclient_la-D4Connect.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4Connect.cc' object='libdapclient_la-D4Connect.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdapclient_la-D4Connect.lo -MD -MP -MF $(DEPDIR)/libdapclient_la-D4Connect.Tpo -c -o libdapclient_la-D4Connect.lo `test -f 'D4Connect.cc' || echo '$(srcdir)/'`D4Connect.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdapclient_la-D4Connect.Tpo $(DEPDIR)/libdapclient_la-D4Connect.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4Connect.cc' object='libdapclient_la-D4Connect.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-D4Connect.lo `test -f 'D4Connect.cc' || echo '$(srcdir)/'`D4Connect.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdapclient_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdapclient_la-D4Connect.lo `test -f 'D4Connect.cc' || echo '$(srcdir)/'`D4Connect.cc
libparsers_la-lex.das.lo: lex.das.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.das.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.das.Tpo -c -o libparsers_la-lex.das.lo `test -f 'lex.das.cc' || echo '$(srcdir)/'`lex.das.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libparsers_la-lex.das.Tpo $(DEPDIR)/libparsers_la-lex.das.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lex.das.cc' object='libparsers_la-lex.das.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.das.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.das.Tpo -c -o libparsers_la-lex.das.lo `test -f 'lex.das.cc' || echo '$(srcdir)/'`lex.das.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-lex.das.Tpo $(DEPDIR)/libparsers_la-lex.das.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='lex.das.cc' object='libparsers_la-lex.das.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.das.lo `test -f 'lex.das.cc' || echo '$(srcdir)/'`lex.das.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.das.lo `test -f 'lex.das.cc' || echo '$(srcdir)/'`lex.das.cc
libparsers_la-lex.dds.lo: lex.dds.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.dds.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.dds.Tpo -c -o libparsers_la-lex.dds.lo `test -f 'lex.dds.cc' || echo '$(srcdir)/'`lex.dds.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libparsers_la-lex.dds.Tpo $(DEPDIR)/libparsers_la-lex.dds.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lex.dds.cc' object='libparsers_la-lex.dds.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.dds.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.dds.Tpo -c -o libparsers_la-lex.dds.lo `test -f 'lex.dds.cc' || echo '$(srcdir)/'`lex.dds.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-lex.dds.Tpo $(DEPDIR)/libparsers_la-lex.dds.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='lex.dds.cc' object='libparsers_la-lex.dds.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.dds.lo `test -f 'lex.dds.cc' || echo '$(srcdir)/'`lex.dds.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.dds.lo `test -f 'lex.dds.cc' || echo '$(srcdir)/'`lex.dds.cc
libparsers_la-lex.ce_expr.lo: lex.ce_expr.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.ce_expr.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.ce_expr.Tpo -c -o libparsers_la-lex.ce_expr.lo `test -f 'lex.ce_expr.cc' || echo '$(srcdir)/'`lex.ce_expr.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libparsers_la-lex.ce_expr.Tpo $(DEPDIR)/libparsers_la-lex.ce_expr.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lex.ce_expr.cc' object='libparsers_la-lex.ce_expr.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.ce_expr.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.ce_expr.Tpo -c -o libparsers_la-lex.ce_expr.lo `test -f 'lex.ce_expr.cc' || echo '$(srcdir)/'`lex.ce_expr.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-lex.ce_expr.Tpo $(DEPDIR)/libparsers_la-lex.ce_expr.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='lex.ce_expr.cc' object='libparsers_la-lex.ce_expr.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.ce_expr.lo `test -f 'lex.ce_expr.cc' || echo '$(srcdir)/'`lex.ce_expr.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.ce_expr.lo `test -f 'lex.ce_expr.cc' || echo '$(srcdir)/'`lex.ce_expr.cc
libparsers_la-lex.Error.lo: lex.Error.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.Error.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.Error.Tpo -c -o libparsers_la-lex.Error.lo `test -f 'lex.Error.cc' || echo '$(srcdir)/'`lex.Error.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libparsers_la-lex.Error.Tpo $(DEPDIR)/libparsers_la-lex.Error.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lex.Error.cc' object='libparsers_la-lex.Error.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-lex.Error.lo -MD -MP -MF $(DEPDIR)/libparsers_la-lex.Error.Tpo -c -o libparsers_la-lex.Error.lo `test -f 'lex.Error.cc' || echo '$(srcdir)/'`lex.Error.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-lex.Error.Tpo $(DEPDIR)/libparsers_la-lex.Error.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='lex.Error.cc' object='libparsers_la-lex.Error.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.Error.lo `test -f 'lex.Error.cc' || echo '$(srcdir)/'`lex.Error.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-lex.Error.lo `test -f 'lex.Error.cc' || echo '$(srcdir)/'`lex.Error.cc
libparsers_la-das.tab.lo: das.tab.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-das.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-das.tab.Tpo -c -o libparsers_la-das.tab.lo `test -f 'das.tab.cc' || echo '$(srcdir)/'`das.tab.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libparsers_la-das.tab.Tpo $(DEPDIR)/libparsers_la-das.tab.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='das.tab.cc' object='libparsers_la-das.tab.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-das.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-das.tab.Tpo -c -o libparsers_la-das.tab.lo `test -f 'das.tab.cc' || echo '$(srcdir)/'`das.tab.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-das.tab.Tpo $(DEPDIR)/libparsers_la-das.tab.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='das.tab.cc' object='libparsers_la-das.tab.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-das.tab.lo `test -f 'das.tab.cc' || echo '$(srcdir)/'`das.tab.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-das.tab.lo `test -f 'das.tab.cc' || echo '$(srcdir)/'`das.tab.cc
libparsers_la-dds.tab.lo: dds.tab.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-dds.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-dds.tab.Tpo -c -o libparsers_la-dds.tab.lo `test -f 'dds.tab.cc' || echo '$(srcdir)/'`dds.tab.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libparsers_la-dds.tab.Tpo $(DEPDIR)/libparsers_la-dds.tab.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dds.tab.cc' object='libparsers_la-dds.tab.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-dds.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-dds.tab.Tpo -c -o libparsers_la-dds.tab.lo `test -f 'dds.tab.cc' || echo '$(srcdir)/'`dds.tab.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-dds.tab.Tpo $(DEPDIR)/libparsers_la-dds.tab.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dds.tab.cc' object='libparsers_la-dds.tab.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-dds.tab.lo `test -f 'dds.tab.cc' || echo '$(srcdir)/'`dds.tab.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-dds.tab.lo `test -f 'dds.tab.cc' || echo '$(srcdir)/'`dds.tab.cc
libparsers_la-ce_expr.tab.lo: ce_expr.tab.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-ce_expr.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-ce_expr.tab.Tpo -c -o libparsers_la-ce_expr.tab.lo `test -f 'ce_expr.tab.cc' || echo '$(srcdir)/'`ce_expr.tab.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libparsers_la-ce_expr.tab.Tpo $(DEPDIR)/libparsers_la-ce_expr.tab.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ce_expr.tab.cc' object='libparsers_la-ce_expr.tab.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-ce_expr.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-ce_expr.tab.Tpo -c -o libparsers_la-ce_expr.tab.lo `test -f 'ce_expr.tab.cc' || echo '$(srcdir)/'`ce_expr.tab.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-ce_expr.tab.Tpo $(DEPDIR)/libparsers_la-ce_expr.tab.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ce_expr.tab.cc' object='libparsers_la-ce_expr.tab.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-ce_expr.tab.lo `test -f 'ce_expr.tab.cc' || echo '$(srcdir)/'`ce_expr.tab.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-ce_expr.tab.lo `test -f 'ce_expr.tab.cc' || echo '$(srcdir)/'`ce_expr.tab.cc
libparsers_la-Error.tab.lo: Error.tab.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-Error.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-Error.tab.Tpo -c -o libparsers_la-Error.tab.lo `test -f 'Error.tab.cc' || echo '$(srcdir)/'`Error.tab.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libparsers_la-Error.tab.Tpo $(DEPDIR)/libparsers_la-Error.tab.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Error.tab.cc' object='libparsers_la-Error.tab.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libparsers_la-Error.tab.lo -MD -MP -MF $(DEPDIR)/libparsers_la-Error.tab.Tpo -c -o libparsers_la-Error.tab.lo `test -f 'Error.tab.cc' || echo '$(srcdir)/'`Error.tab.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libparsers_la-Error.tab.Tpo $(DEPDIR)/libparsers_la-Error.tab.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Error.tab.cc' object='libparsers_la-Error.tab.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-Error.tab.lo `test -f 'Error.tab.cc' || echo '$(srcdir)/'`Error.tab.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libparsers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libparsers_la-Error.tab.lo `test -f 'Error.tab.cc' || echo '$(srcdir)/'`Error.tab.cc
getdap-getdap.o: getdap.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap-getdap.o -MD -MP -MF $(DEPDIR)/getdap-getdap.Tpo -c -o getdap-getdap.o `test -f 'getdap.cc' || echo '$(srcdir)/'`getdap.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/getdap-getdap.Tpo $(DEPDIR)/getdap-getdap.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='getdap.cc' object='getdap-getdap.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap-getdap.o -MD -MP -MF $(DEPDIR)/getdap-getdap.Tpo -c -o getdap-getdap.o `test -f 'getdap.cc' || echo '$(srcdir)/'`getdap.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/getdap-getdap.Tpo $(DEPDIR)/getdap-getdap.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='getdap.cc' object='getdap-getdap.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap-getdap.o `test -f 'getdap.cc' || echo '$(srcdir)/'`getdap.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap-getdap.o `test -f 'getdap.cc' || echo '$(srcdir)/'`getdap.cc
getdap-getdap.obj: getdap.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap-getdap.obj -MD -MP -MF $(DEPDIR)/getdap-getdap.Tpo -c -o getdap-getdap.obj `if test -f 'getdap.cc'; then $(CYGPATH_W) 'getdap.cc'; else $(CYGPATH_W) '$(srcdir)/getdap.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/getdap-getdap.Tpo $(DEPDIR)/getdap-getdap.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='getdap.cc' object='getdap-getdap.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap-getdap.obj -MD -MP -MF $(DEPDIR)/getdap-getdap.Tpo -c -o getdap-getdap.obj `if test -f 'getdap.cc'; then $(CYGPATH_W) 'getdap.cc'; else $(CYGPATH_W) '$(srcdir)/getdap.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/getdap-getdap.Tpo $(DEPDIR)/getdap-getdap.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='getdap.cc' object='getdap-getdap.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap-getdap.obj `if test -f 'getdap.cc'; then $(CYGPATH_W) 'getdap.cc'; else $(CYGPATH_W) '$(srcdir)/getdap.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap-getdap.obj `if test -f 'getdap.cc'; then $(CYGPATH_W) 'getdap.cc'; else $(CYGPATH_W) '$(srcdir)/getdap.cc'; fi`
getdap4-getdap4.o: getdap4.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap4-getdap4.o -MD -MP -MF $(DEPDIR)/getdap4-getdap4.Tpo -c -o getdap4-getdap4.o `test -f 'getdap4.cc' || echo '$(srcdir)/'`getdap4.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/getdap4-getdap4.Tpo $(DEPDIR)/getdap4-getdap4.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='getdap4.cc' object='getdap4-getdap4.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap4-getdap4.o -MD -MP -MF $(DEPDIR)/getdap4-getdap4.Tpo -c -o getdap4-getdap4.o `test -f 'getdap4.cc' || echo '$(srcdir)/'`getdap4.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/getdap4-getdap4.Tpo $(DEPDIR)/getdap4-getdap4.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='getdap4.cc' object='getdap4-getdap4.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap4-getdap4.o `test -f 'getdap4.cc' || echo '$(srcdir)/'`getdap4.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap4-getdap4.o `test -f 'getdap4.cc' || echo '$(srcdir)/'`getdap4.cc
getdap4-getdap4.obj: getdap4.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap4-getdap4.obj -MD -MP -MF $(DEPDIR)/getdap4-getdap4.Tpo -c -o getdap4-getdap4.obj `if test -f 'getdap4.cc'; then $(CYGPATH_W) 'getdap4.cc'; else $(CYGPATH_W) '$(srcdir)/getdap4.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/getdap4-getdap4.Tpo $(DEPDIR)/getdap4-getdap4.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='getdap4.cc' object='getdap4-getdap4.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT getdap4-getdap4.obj -MD -MP -MF $(DEPDIR)/getdap4-getdap4.Tpo -c -o getdap4-getdap4.obj `if test -f 'getdap4.cc'; then $(CYGPATH_W) 'getdap4.cc'; else $(CYGPATH_W) '$(srcdir)/getdap4.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/getdap4-getdap4.Tpo $(DEPDIR)/getdap4-getdap4.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='getdap4.cc' object='getdap4-getdap4.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap4-getdap4.obj `if test -f 'getdap4.cc'; then $(CYGPATH_W) 'getdap4.cc'; else $(CYGPATH_W) '$(srcdir)/getdap4.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdap4_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o getdap4-getdap4.obj `if test -f 'getdap4.cc'; then $(CYGPATH_W) 'getdap4.cc'; else $(CYGPATH_W) '$(srcdir)/getdap4.cc'; fi`
mostlyclean-libtool:
-rm -f *.lo
@@ -2059,11 +2201,18 @@ distclean-libtool:
-rm -f libtool config.lt
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list=''; test -n "$(man1dir)" || exit 0; \
- { for i in $$list; do echo "$$i"; done; \
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
- sed -n '/\.1[a-z]*$$/p'; \
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -2092,13 +2241,14 @@ uninstall-man1:
sed -n '/\.1[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -z "$$files" || { \
- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-dist_aclocalDATA: $(dist_aclocal_DATA)
@$(NORMAL_INSTALL)
- test -z "$(aclocaldir)" || $(MKDIR_P) "$(DESTDIR)$(aclocaldir)"
@list='$(dist_aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(aclocaldir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -2112,13 +2262,14 @@ uninstall-dist_aclocalDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(aclocaldir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(aclocaldir)" && rm -f $$files
+ dir='$(DESTDIR)$(aclocaldir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -2132,13 +2283,14 @@ uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -2152,27 +2304,28 @@ uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -2187,57 +2340,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in dods-datatypes-config.h.in xdr-datatypes-config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -2253,12 +2361,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in dods-datatypes-config.h.i
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) config.h.in dods-datatypes-config.h.in xdr-datatypes-config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -2270,15 +2373,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in dods-datatypes-config.h.i
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in dods-datatypes-config.h.in xdr-datatypes-config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in dods-datatypes-config.h.in xdr-datatypes-config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -2287,9 +2386,31 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
@case `sed 15q $(srcdir)/NEWS` in \
@@ -2298,19 +2419,6 @@ distdir: $(DISTFILES)
echo "NEWS not updated; not releasing" 1>&2; \
exit 1;; \
esac
- @list='$(MANS)'; if test -n "$$list"; then \
- list=`for p in $$list; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
- if test -n "$$list" && \
- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
- echo " typically \`make maintainer-clean' will remove them" >&2; \
- exit 1; \
- else :; fi; \
- else :; fi
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -2344,13 +2452,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -2379,36 +2484,42 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__post_remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__post_remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(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__remove_distdir)
+ $(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__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -2419,8 +2530,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -2430,9 +2541,9 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -2440,6 +2551,7 @@ distcheck: dist
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -2463,13 +2575,21 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -2509,10 +2629,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -2609,49 +2734,49 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-man: uninstall-man1
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
- ctags-recursive install install-am install-strip \
- tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-binPROGRAMS \
- clean-generic clean-libLTLIBRARIES clean-libtool \
- clean-noinstLTLIBRARIES ctags ctags-recursive dist dist-all \
- dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-compile \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-binSCRIPTS install-data \
- install-data-am install-dist_aclocalDATA install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
+.MAKE: $(am__recursive_targets) all check install install-am \
+ install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-binPROGRAMS \
+ clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
+ clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \
+ dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
+ dist-tarZ dist-xz dist-zip distcheck distclean \
+ distclean-compile distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-binSCRIPTS \
+ install-data install-data-am install-dist_aclocalDATA \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
install-libLTLIBRARIES install-man install-man1 install-pdf \
install-pdf-am install-pkgconfigDATA install-pkgincludeHEADERS \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-binSCRIPTS \
- uninstall-dist_aclocalDATA uninstall-libLTLIBRARIES \
- uninstall-man uninstall-man1 uninstall-pkgconfigDATA \
- uninstall-pkgincludeHEADERS
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-binSCRIPTS uninstall-dist_aclocalDATA \
+ uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
+ uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
%.1: %.man1
groff -t -e -mandoc -Tascii $< | col -bx > $@
+# This target only builds the documents, it does not move them to
+# github. Use the 'gh-docs' target below for that.
.PHONY: docs
-docs: doxy.conf
- doxygen doxy.conf
- (cd docs && tar -czf html.tar.gz html)
+docs: ${DOXYGEN_CONF}
+ doxygen ${DOXYGEN_CONF}
-# Not needed. jhrg 1/4/16
-# doxy.conf: doxy.conf.in config.status
-# ./config.status --file=doxy.conf
+# GitHub.io docs
+.PHONY: gh-docs
+gh-docs:
+ ./build-gh-docs.sh
-# cccc computes metrics like Lines of code and McCabe. It'a available
+# cccc computes metrics like Lines of code and McCabe. It's available
# on the web...
.PHONY: cccc
cccc:
diff --git a/NEWS b/NEWS
index d58f0e3..b9f4ad9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+News for version 3.19.0
+
+Bug fixes in memory usage for Vector types.
+
+Refactored transform_to_dap4() methods and associated API
+
+Implmented transform_to_dap2() method.
+
+Refactored test harnesses so that running individual
+tests is now a viable option.
+
News for version 3.18.3
Bug fix for DAP4 data transmissions.
diff --git a/Sequence.cc b/Sequence.cc
index 21c8a3d..53ef873 100644
--- a/Sequence.cc
+++ b/Sequence.cc
@@ -207,17 +207,21 @@ Sequence::ptr_duplicate()
* @param container Load the result into this container
* @return The new D4Sequence
*/
-BaseType *
+void
Sequence::transform_to_dap4(D4Group *root, Constructor *container)
{
- D4Sequence *dest = new D4Sequence(name());
-
+ D4Sequence *dest;
+ // If it's already a DAP4 object then we can just return it!
+ if(is_dap4()){
+ dest = static_cast<D4Sequence*>(ptr_duplicate());
+ dest->set_length(-1);
+ container->add_var_nocopy(dest);
+ return;
+ }
+ dest = new D4Sequence(name());
Constructor::transform_to_dap4(root, dest);
-
dest->set_length(-1);
- dest->set_parent(container);
-
- return dest;
+ container->add_var_nocopy(dest);
}
static inline void delete_bt(BaseType *bt_ptr)
diff --git a/Sequence.h b/Sequence.h
index b4b6701..49aafee 100644
--- a/Sequence.h
+++ b/Sequence.h
@@ -233,7 +233,7 @@ public:
virtual void clear_local_data();
- virtual BaseType *transform_to_dap4(D4Group *root, Constructor *container);
+ virtual void transform_to_dap4(D4Group *root, Constructor *container);
virtual bool is_dap2_only_type();
diff --git a/Structure.cc b/Structure.cc
index b81c04a..fbce0d6 100644
--- a/Structure.cc
+++ b/Structure.cc
@@ -148,23 +148,85 @@ Structure::ptr_duplicate()
* @param container
* @return The new variable
*/
-BaseType *
+void
Structure::transform_to_dap4(D4Group *root, Constructor *container)
{
- // For this class, ptr_duplicate() calls the const ctor which calls
- // Constructor's const ctor which calls Constructor::m_duplicate().
- // Here we replicate some of that functionality, but instead call
- // transform_to_dap4() on the contained variables.
-
- // Structure *dest = static_cast<Structure*>(ptr_duplicate());
+ DBG(cerr << __func__ <<"() - BEGIN" << endl;);
+ // Here we create a new Structure and then use it
+ // as the target container for the transformed versions of
+ // all the member variables by calling Constructor::transform_to_dap4() and
+ // passing our new target Structure in as the target container.
Structure *dest = new Structure(name());
-
+ DBG(cerr << __func__ <<"() - Calling Constructor::transform_to_dap4("<<
+ "'" << root->name() << "':" << (void*)root << ","
+ "'" << dest->name() << "':" << (void*)dest << ")"
+ << endl; );
Constructor::transform_to_dap4(root, dest);
- dest->set_parent(container);
+ container->add_var_nocopy(dest);
+ DBG(cerr << __func__ <<"() - Added new Structure '" << dest->name() << "' (" << (void*)dest <<
+ ") to the container '" << container->name() <<"'" << endl;);
+ DBG(cerr << __func__ <<"() - END"<< endl;);
+}
+
- return dest;
+/** @brief DAP4 to DAP2 transform
+ *
+ * Return a DAP2 'copy' of the variable.
+ *
+ * @return A pointer to the transformed variable
+ */
+vector<BaseType *> *
+Structure::transform_to_dap2(AttrTable *)
+{
+ DBG(cerr << " " << __func__ << " BEGIN" << endl);
+ Structure *dest = new Structure(name());
+
+ // convert the Structure's d4 attributes to a dap2 attribute table.
+ AttrTable *attrs = this->attributes()->get_AttrTable(name());
+ dest->set_is_dap4(false);
+
+ vector<BaseType *> dropped_vars;
+ for (Structure::Vars_citer i = var_begin(), e = var_end(); i != e; ++i) {
+ vector<BaseType *> *new_vars = (*i)->transform_to_dap2(attrs);
+ if (new_vars) { // Might be un-mappable
+ // It's not so game on..
+ vector<BaseType*>::iterator vIter = new_vars->begin();
+ vector<BaseType*>::iterator end = new_vars->end();
+ for( ; vIter!=end ; vIter++ ){
+ BaseType *new_var = (*vIter);
+ new_var->set_parent(dest);
+ dest->add_var_nocopy(new_var);
+ (*vIter) = NULL;
+ }
+ delete new_vars;
+
+ }
+ else {
+ // Got a NULL, so we are dropping this var.
+ dropped_vars.push_back(*i);
+ }
+ }
+
+ AttrTable *dv_attr_table = make_dropped_vars_attr_table(&dropped_vars);
+ if(dv_attr_table){
+ DBG(cerr << " " << __func__ << "() - Adding "<< dv_attr_table->get_name() << " AttrTable" << endl);
+ attrs->append_container(dv_attr_table,dv_attr_table->get_name());
+ }
+ DBG(attrs->print(cerr,"",true););
+ // Since this does a copy we gotta delete the attrs when done
+ dest->set_attr_table(*attrs);
+ delete attrs;
+
+ vector<BaseType *> *result = new vector<BaseType *>();
+ result->push_back(dest);
+ DBG(cerr << " " << __func__ << " END" << endl);
+ return result;
}
+
+
+
+
Structure &
Structure::operator=(const Structure &rhs)
{
diff --git a/Structure.h b/Structure.h
index 30a024e..d7b8f5c 100644
--- a/Structure.h
+++ b/Structure.h
@@ -95,7 +95,8 @@ public:
Structure &operator=(const Structure &rhs);
virtual BaseType *ptr_duplicate();
- virtual BaseType *transform_to_dap4(D4Group *root, Constructor *container);
+ virtual void transform_to_dap4(D4Group *root, Constructor *container);
+ virtual vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
virtual bool is_linear();
diff --git a/UInt64.cc b/UInt64.cc
index 58aa954..5858c21 100644
--- a/UInt64.cc
+++ b/UInt64.cc
@@ -231,6 +231,40 @@ UInt64::d4_ops(BaseType *b, int op)
}
}
+
+
+/** @brief DAP4 to DAP2 transform
+ *
+ * For the current BaseType, return a DAP2 'copy' of the variable.
+ *
+ * @note For most DAP4 types, in this implementation of DAP2 the corresponding
+ * DAP4 type is the same. The different types are Sequences (which are D4Sequences
+ * in the DAP4 implementation), Grids (which are coverages) and Arrays (which use
+ * shared dimensions).
+ *
+ * @param root The root group that should hold this new variable. Add Group-level
+ * stuff here (e.g., D4Dimensions).
+ * @param container Add the new variable to this container.
+ *
+ * @return A pointer to the transformed variable
+ */
+std::vector<BaseType *> *
+UInt64::transform_to_dap2(AttrTable *)
+{
+#if 0
+ BaseType *dest = this->ptr_duplicate();
+ // convert the d4 attributes to a dap2 attribute table.
+ AttrTable *attrs = this->attributes()->get_AttrTable();
+ attrs->set_name(name());
+ dest->set_attr_table(*attrs);
+ dest->set_is_dap4(false);
+ // attrs->print(cerr,"",true);
+ return dest;
+#endif
+
+ return NULL;
+}
+
/** @brief dumps information about this object
*
* Displays the pointer value of this instance and information about this
diff --git a/UInt64.h b/UInt64.h
index 774657b..ef4bbe5 100644
--- a/UInt64.h
+++ b/UInt64.h
@@ -84,6 +84,7 @@ public:
virtual bool ops(BaseType *b, int op);
virtual bool d4_ops(BaseType *b, int op);
+ virtual std::vector<BaseType *> *transform_to_dap2(AttrTable *parent_attr_table);
virtual void dump(ostream &strm) const ;
};
diff --git a/Vector.cc b/Vector.cc
index 17234e2..e43b10a 100644
--- a/Vector.cc
+++ b/Vector.cc
@@ -436,25 +436,23 @@ BaseType *Vector::var(const string &n, bool exact, btp_stack *s)
string name = www2id(n);
DBG2(cerr << "Vector::var: Looking for " << name << endl);
+ if (name == "" || d_proto->name() == name) {
+ if (s)
+ s->push(this);
+ return d_proto;
+ }
+
// If this is a Vector of constructor types, look for 'name' recursively.
// Make sure to check for the case where name is the default (the empty
// string). 9/1/98 jhrg
if (d_proto->is_constructor_type()) {
- if (name == "" || d_proto->name() == name) {
- if (s)
- s->push(this);
- return d_proto;
- }
- else {
- BaseType * result = d_proto->var(name, exact, s);
- if (result && s)
- s->push(this);
- return result;
- }
- }
- else {
- return d_proto;
+ BaseType *result = d_proto->var(name, exact, s);
+ if (result && s)
+ s->push(this);
+ return result;
}
+
+ return NULL;
}
/** This version of var(...) searches for <i>name</i> and returns a
@@ -580,8 +578,11 @@ void Vector::vec_resize(int l)
if (m_is_cardinal_type())
throw InternalErr(__FILE__, __LINE__, "Vector::vec_resize() is applicable to compound types only");
- d_compound_buf.resize((l > 0) ? l : 0, 0); // Fill with NULLs
- d_capacity = l; // capacity in terms of number of elements.
+ // Use resize() since other parts of the code use operator[]. Note that size() should
+ // be used when resize() is used. Using capacity() creates problems as noted in the
+ // comment in set_vec_nocopy(). jhrg 5/19/17
+ d_compound_buf.resize(l, 0); // Fill with NULLs
+ d_capacity = d_compound_buf.size(); // size in terms of number of elements.
}
/** @brief read data into a variable for later use
@@ -838,7 +839,11 @@ bool Vector::deserialize(UnMarshaller &um, DDS * dds, bool reuse)
break;
case dods_array_c:
- // TODO
+ // Added jhrg 5/18/17
+ // This replaces a comment that was simply 'TO DO'
+ throw InternalErr(__FILE__, __LINE__, "Array of array!");
+ break;
+
case dods_structure_c:
case dods_sequence_c:
case dods_grid_c:
@@ -959,7 +964,7 @@ void Vector::intern_data(/*Crc32 &checksum, DMR &dmr, ConstraintEvaluator &eval*
}
void
-Vector::serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*/ bool filter /*= false*/)
+Vector::serialize(D4StreamMarshaller &m, DMR &dmr, bool filter /*= false*/)
{
if (!read_p())
read(); // read() throws Error and InternalErr
@@ -969,7 +974,7 @@ Vector::serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*
#endif
int64_t num = length(); // The constrained length in elements
- DBG(cerr << __PRETTY_FUNCTION__ << ", num: " << num << endl);
+ DBG(cerr << __func__ << ", num: " << num << endl);
// Added in case we're trying to serialize a zero-length array. jhrg 1/27/16
if (num == 0)
@@ -1024,8 +1029,10 @@ Vector::serialize(D4StreamMarshaller &m, DMR &dmr, /*ConstraintEvaluator &eval,*
case dods_sequence_c:
assert(d_compound_buf.capacity() >= 0);
- for (int64_t i = 0; i < num; ++i)
- d_compound_buf[i]->serialize(m, dmr, /*eval,*/ filter);
+ for (int64_t i = 0; i < num; ++i) {
+ DBG(cerr << __func__ << "d_compound_buf[" << i << "] " << d_compound_buf[i] << endl);
+ d_compound_buf[i]->serialize(m, dmr, filter);
+ }
break;
@@ -1336,12 +1343,17 @@ void Vector::set_vec(unsigned int i, BaseType * val)
Vector::set_vec_nocopy(i, val->ptr_duplicate());
}
-/** @brief Sets element <i>i</i> to value <i>val</i>.
-
- @note This method does not copy \e val; this class will free the instance
- when the variable is deleted or when clear_local_data() is called.
-
- @see Vector::set_vec() */
+/**
+ * @brief Sets element <i>i</i> to value <i>val</i>.
+ * Set the ith element to val. Extend the vector if needed.
+ *
+ * @note It is best to call vec_resize() first and allocate enough elements
+ * before calling this method.
+ *
+ * @note This method does not copy \e val; this class will free the instance
+ * when the variable is deleted or when clear_local_data() is called.
+ * @see Vector::set_vec()
+ * */
void Vector::set_vec_nocopy(unsigned int i, BaseType * val)
{
// Jose Garcia
@@ -1355,8 +1367,17 @@ void Vector::set_vec_nocopy(unsigned int i, BaseType * val)
if (val->type() != d_proto->type())
throw InternalErr(__FILE__, __LINE__, "invalid data: type of incoming object does not match *this* vector type.");
- if (i >= d_compound_buf.capacity())
- vec_resize(i + 10);
+ // This code originally used capacity() instead of size(), but that was an error.
+ // Use capacity() when using reserve() and size() when using resize(). Mixing
+ // capacity() with resize() leaves holes in the data, where (pointer) values are
+ // filled with nulls during successive calls to resize(). The resize() heuristic
+ // remembers previous calls on a given vector<> and allocates larger than requested
+ // blocks of memory on successive calls, which has the strange affect of erasing
+ // values already in the vector in the parts just added.
+ // jhrg 5/18/17
+ if (i >= d_compound_buf.size()) {
+ vec_resize(d_compound_buf.size() + 100);
+ }
d_compound_buf[i] = val;
}
diff --git a/XMLWriter.cc b/XMLWriter.cc
index be1c533..1a95355 100644
--- a/XMLWriter.cc
+++ b/XMLWriter.cc
@@ -36,6 +36,7 @@
#include "XMLWriter.h"
#include "InternalErr.h"
+// TODO - Bite the bullet and make the encoding UTF-8 as required by dap4. This will break a lot of tests but the baselines could be amended using a bash script and sed.
const char *ENCODING = "ISO-8859-1";
const int XML_BUF_SIZE = 2000000;
diff --git a/aclocal.m4 b/aclocal.m4
index d0670b8..58149a1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 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.
@@ -11,15 +11,16 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,10 +32,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
# 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.11'
+[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.11.1], [],
+m4_if([$1], [1.14], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,22 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# 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.11.1])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]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# 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.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -84,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -110,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-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.
-# serial 9
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -144,16 +142,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# 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.
-# serial 10
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
@@ -163,7 +159,7 @@ fi])])
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -176,12 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
@@ -189,8 +186,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -229,16 +227,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -247,16 +245,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
break
fi
;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -304,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -314,34 +312,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# 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.
-#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -354,7 +357,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -366,21 +369,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
@@ -398,7 +399,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
@@ -408,18 +409,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-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.
-# serial 16
-
# 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])
# -----------------------------------------------
@@ -432,7 +436,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -461,31 +465,40 @@ AC_SUBST([CYGPATH_W])
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@ -496,34 +509,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+# 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: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at 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: <http://www.gnu.org/software/coreutils/>.
+
+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
dnl mangled by Autoconf and run in a shell conditional statement.
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.
@@ -545,7 +602,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# 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,
@@ -564,16 +621,14 @@ if test x"${install_sh}" != xset; then
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-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.
-# serial 2
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -587,21 +642,18 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-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.
-# serial 5
-
# AM_PROG_LEX
# -----------
# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
# "missing" invocation, for better error output.
AC_DEFUN([AM_PROG_LEX],
-[AC_PREREQ(2.50)dnl
+[AC_PREREQ([2.50])dnl
AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
AC_REQUIRE([AC_PROG_LEX])dnl
if test "$LEX" = :; then
@@ -610,14 +662,12 @@ fi])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# 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.
-# serial 4
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -635,7 +685,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -660,52 +710,14 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# 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.
-
-# serial 6
-
-# 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, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-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.
-# serial 6
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -713,11 +725,10 @@ AC_DEFUN([AM_MISSING_PROG],
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
@@ -730,63 +741,35 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 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_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# 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.
-# serial 4
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -797,24 +780,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+# 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])])
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# 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.
-# serial 5
+# 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.
+#
+# 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_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -825,32 +866,40 @@ case `pwd` in
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$[2]" = conftest.file
)
then
@@ -860,9 +909,85 @@ else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-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_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# 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,
@@ -870,34 +995,32 @@ AC_MSG_RESULT(yes)])
# AM_PROG_INSTALL_STRIP
# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-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.
-# serial 2
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -905,24 +1028,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004-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.
-# serial 2
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
@@ -932,75 +1053,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
+#
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
diff --git a/ce_expr.tab.cc b/ce_expr.tab.cc
index 9ede58e..fa0b19f 100644
--- a/ce_expr.tab.cc
+++ b/ce_expr.tab.cc
@@ -1474,47 +1474,47 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 241 "ce_expr.yy" /* yacc.c:1646 */
+#line 241 "ce_expr.yy" /* yacc.c:1661 */
{
DBG(cerr << "Mark all variables" << endl);
DDS(arg)->mark_all(true);
(yyval.boolean) = true;
}
-#line 1484 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1484 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 4:
-#line 249 "ce_expr.yy" /* yacc.c:1646 */
+#line 249 "ce_expr.yy" /* yacc.c:1661 */
{ DDS(arg)->mark_all(true); }
-#line 1490 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1490 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 5:
-#line 250 "ce_expr.yy" /* yacc.c:1646 */
+#line 250 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (yyvsp[0].boolean);
}
-#line 1498 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1498 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 6:
-#line 254 "ce_expr.yy" /* yacc.c:1646 */
+#line 254 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
}
-#line 1506 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1506 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 8:
-#line 261 "ce_expr.yy" /* yacc.c:1646 */
+#line 261 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
}
-#line 1514 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1514 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 9:
-#line 267 "ce_expr.yy" /* yacc.c:1646 */
+#line 267 "ce_expr.yy" /* yacc.c:1661 */
{
BaseType *var = DDS(arg)->var((yyvsp[0].id));
if (var) {
@@ -1526,27 +1526,27 @@ yyreduce:
no_such_ident(arg, (yyvsp[0].id), "identifier");
}
}
-#line 1530 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1530 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 10:
-#line 279 "ce_expr.yy" /* yacc.c:1646 */
+#line 279 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (yyvsp[0].boolean);
}
-#line 1538 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1538 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 11:
-#line 283 "ce_expr.yy" /* yacc.c:1646 */
+#line 283 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (yyvsp[0].boolean);
}
-#line 1546 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1546 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 12:
-#line 287 "ce_expr.yy" /* yacc.c:1646 */
+#line 287 "ce_expr.yy" /* yacc.c:1661 */
{
Array *array = dynamic_cast<Array*>((yyvsp[0].rval_ptr)->bvalue(*DDS(arg)));
if (array) {
@@ -1564,67 +1564,67 @@ yyreduce:
return false;
}
}
-#line 1568 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1568 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 13:
-#line 311 "ce_expr.yy" /* yacc.c:1646 */
+#line 311 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = build_constant_array<dods_byte, Byte>((yyvsp[-1].byte_values), DDS(arg));
}
-#line 1576 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1576 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 14:
-#line 317 "ce_expr.yy" /* yacc.c:1646 */
+#line 317 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = build_constant_array<dods_int16, Int16>((yyvsp[-1].int16_values), DDS(arg));
}
-#line 1584 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1584 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 15:
-#line 323 "ce_expr.yy" /* yacc.c:1646 */
+#line 323 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = build_constant_array<dods_uint16, UInt16>((yyvsp[-1].uint16_values), DDS(arg));
}
-#line 1592 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1592 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 16:
-#line 329 "ce_expr.yy" /* yacc.c:1646 */
+#line 329 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = build_constant_array<dods_int32, Int32>((yyvsp[-1].int32_values), DDS(arg));
}
-#line 1600 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1600 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 17:
-#line 335 "ce_expr.yy" /* yacc.c:1646 */
+#line 335 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = build_constant_array<dods_uint32, UInt32>((yyvsp[-1].uint32_values), DDS(arg));
}
-#line 1608 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1608 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 18:
-#line 341 "ce_expr.yy" /* yacc.c:1646 */
+#line 341 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = build_constant_array<dods_float32, Float32>((yyvsp[-1].float32_values), DDS(arg));
}
-#line 1616 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1616 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 19:
-#line 347 "ce_expr.yy" /* yacc.c:1646 */
+#line 347 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = build_constant_array<dods_float64, Float64>((yyvsp[-1].float64_values), DDS(arg));
}
-#line 1624 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1624 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 20:
-#line 356 "ce_expr.yy" /* yacc.c:1646 */
+#line 356 "ce_expr.yy" /* yacc.c:1661 */
{
if (!check_int32((yyvsp[0].id)))
throw Error(malformed_expr, "$<type>(hint, value, ...) special form expected hint to be an integer");
@@ -1632,179 +1632,179 @@ yyreduce:
arg_length_hint_value = atoi((yyvsp[0].id));
(yyval.boolean) = true;
}
-#line 1636 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1636 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 21:
-#line 367 "ce_expr.yy" /* yacc.c:1646 */
+#line 367 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.byte_values) = make_fast_arg_list<byte_arg_list, dods_byte>(arg_length_hint_value, (yyvsp[0].byte_value));
}
-#line 1644 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1644 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 22:
-#line 371 "ce_expr.yy" /* yacc.c:1646 */
+#line 371 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.byte_values) = make_fast_arg_list<byte_arg_list, dods_byte>((yyvsp[-2].byte_values), (yyvsp[0].byte_value));
}
-#line 1652 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1652 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 23:
-#line 378 "ce_expr.yy" /* yacc.c:1646 */
+#line 378 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.byte_value) = strtol((yyvsp[0].id), 0, 0);
}
-#line 1660 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1660 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 24:
-#line 385 "ce_expr.yy" /* yacc.c:1646 */
+#line 385 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.int16_values) = make_fast_arg_list<int16_arg_list, dods_int16>(arg_length_hint_value, (yyvsp[0].int16_value));
}
-#line 1668 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1668 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 25:
-#line 389 "ce_expr.yy" /* yacc.c:1646 */
+#line 389 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.int16_values) = make_fast_arg_list<int16_arg_list, dods_int16>((yyvsp[-2].int16_values), (yyvsp[0].int16_value));
}
-#line 1676 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1676 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 26:
-#line 396 "ce_expr.yy" /* yacc.c:1646 */
+#line 396 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.int16_value) = strtol((yyvsp[0].id), 0, 0);
}
-#line 1684 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1684 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 27:
-#line 403 "ce_expr.yy" /* yacc.c:1646 */
+#line 403 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.uint16_values) = make_fast_arg_list<uint16_arg_list, dods_uint16>(arg_length_hint_value, (yyvsp[0].uint16_value));
}
-#line 1692 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1692 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 28:
-#line 407 "ce_expr.yy" /* yacc.c:1646 */
+#line 407 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.uint16_values) = make_fast_arg_list<uint16_arg_list, dods_uint16>((yyvsp[-2].uint16_values), (yyvsp[0].uint16_value));
}
-#line 1700 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1700 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 29:
-#line 414 "ce_expr.yy" /* yacc.c:1646 */
+#line 414 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.uint16_value) = strtoul((yyvsp[0].id), 0, 0);
}
-#line 1708 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1708 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 30:
-#line 421 "ce_expr.yy" /* yacc.c:1646 */
+#line 421 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.int32_values) = make_fast_arg_list<int32_arg_list, dods_int32>(arg_length_hint_value, (yyvsp[0].int32_value));
}
-#line 1716 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1716 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 31:
-#line 425 "ce_expr.yy" /* yacc.c:1646 */
+#line 425 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.int32_values) = make_fast_arg_list<int32_arg_list, dods_int32>((yyvsp[-2].int32_values), (yyvsp[0].int32_value));
}
-#line 1724 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1724 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 32:
-#line 432 "ce_expr.yy" /* yacc.c:1646 */
+#line 432 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.int32_value) = strtol((yyvsp[0].id), 0, 0);
}
-#line 1732 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1732 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 33:
-#line 439 "ce_expr.yy" /* yacc.c:1646 */
+#line 439 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.uint32_values) = make_fast_arg_list<uint32_arg_list, dods_uint32>(arg_length_hint_value, (yyvsp[0].uint32_value));
}
-#line 1740 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1740 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 34:
-#line 443 "ce_expr.yy" /* yacc.c:1646 */
+#line 443 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.uint32_values) = make_fast_arg_list<uint32_arg_list, dods_uint32>((yyvsp[-2].uint32_values), (yyvsp[0].uint32_value));
}
-#line 1748 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1748 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 35:
-#line 450 "ce_expr.yy" /* yacc.c:1646 */
+#line 450 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.uint32_value) = strtoul((yyvsp[0].id), 0, 0);
}
-#line 1756 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1756 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 36:
-#line 457 "ce_expr.yy" /* yacc.c:1646 */
+#line 457 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.float32_values) = make_fast_arg_list<float32_arg_list, dods_float32>(arg_length_hint_value, (yyvsp[0].float32_value));
}
-#line 1764 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1764 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 37:
-#line 461 "ce_expr.yy" /* yacc.c:1646 */
+#line 461 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.float32_values) = make_fast_arg_list<float32_arg_list, dods_float32>((yyvsp[-2].float32_values), (yyvsp[0].float32_value));
}
-#line 1772 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1772 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 38:
-#line 468 "ce_expr.yy" /* yacc.c:1646 */
+#line 468 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.float32_value) = strtof((yyvsp[0].id), 0);
}
-#line 1780 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1780 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 39:
-#line 475 "ce_expr.yy" /* yacc.c:1646 */
+#line 475 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.float64_values) = make_fast_arg_list<float64_arg_list, dods_float64>(arg_length_hint_value, (yyvsp[0].float64_value));
}
-#line 1788 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1788 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 40:
-#line 479 "ce_expr.yy" /* yacc.c:1646 */
+#line 479 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.float64_values) = make_fast_arg_list<float64_arg_list, dods_float64>((yyvsp[-2].float64_values), (yyvsp[0].float64_value));
}
-#line 1796 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1796 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 41:
-#line 486 "ce_expr.yy" /* yacc.c:1646 */
+#line 486 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.float64_value) = strtod((yyvsp[0].id), 0);
}
-#line 1804 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1804 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 42:
-#line 493 "ce_expr.yy" /* yacc.c:1646 */
+#line 493 "ce_expr.yy" /* yacc.c:1661 */
{
proj_func p_f = 0;
btp_func f = 0;
@@ -1824,19 +1824,19 @@ yyreduce:
no_such_func(arg, (yyvsp[-3].id));
}
}
-#line 1828 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1828 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 44:
-#line 516 "ce_expr.yy" /* yacc.c:1646 */
+#line 516 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
}
-#line 1836 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1836 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 45:
-#line 522 "ce_expr.yy" /* yacc.c:1646 */
+#line 522 "ce_expr.yy" /* yacc.c:1661 */
{
if ((yyvsp[-4].rval_ptr)) {
EVALUATOR(arg)->append_clause((yyvsp[-3].op), (yyvsp[-4].rval_ptr), (yyvsp[-1].r_val_l_ptr));
@@ -1845,11 +1845,11 @@ yyreduce:
else
(yyval.boolean) = false;
}
-#line 1849 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1849 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 46:
-#line 531 "ce_expr.yy" /* yacc.c:1646 */
+#line 531 "ce_expr.yy" /* yacc.c:1661 */
{
if ((yyvsp[-2].rval_ptr)) {
rvalue_list *rv = new rvalue_list;
@@ -1860,19 +1860,19 @@ yyreduce:
else
(yyval.boolean) = false;
}
-#line 1864 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1864 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 47:
-#line 542 "ce_expr.yy" /* yacc.c:1646 */
+#line 542 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (yyvsp[0].boolean);
}
-#line 1872 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1872 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 48:
-#line 549 "ce_expr.yy" /* yacc.c:1646 */
+#line 549 "ce_expr.yy" /* yacc.c:1661 */
{
bool_func b_func = get_function((*EVALUATOR(arg)), (yyvsp[-3].id));
if (!b_func) {
@@ -1883,11 +1883,11 @@ yyreduce:
(yyval.boolean) = true;
}
}
-#line 1887 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1887 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 50:
-#line 564 "ce_expr.yy" /* yacc.c:1646 */
+#line 564 "ce_expr.yy" /* yacc.c:1661 */
{
btp_func func = get_btp_function((*EVALUATOR(arg)), (yyvsp[-3].id));
if (func) {
@@ -1897,65 +1897,65 @@ yyreduce:
no_such_func(arg, (yyvsp[-3].id));
}
}
-#line 1901 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1901 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 51:
-#line 574 "ce_expr.yy" /* yacc.c:1646 */
+#line 574 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = (yyvsp[0].rval_ptr);
}
-#line 1909 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1909 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 52:
-#line 578 "ce_expr.yy" /* yacc.c:1646 */
+#line 578 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.rval_ptr) = (yyvsp[0].rval_ptr);
}
-#line 1917 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1917 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 53:
-#line 584 "ce_expr.yy" /* yacc.c:1646 */
+#line 584 "ce_expr.yy" /* yacc.c:1661 */
{
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 1928 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1928 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 54:
-#line 591 "ce_expr.yy" /* yacc.c:1646 */
+#line 591 "ce_expr.yy" /* yacc.c:1661 */
{
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 1939 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1939 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 55:
-#line 600 "ce_expr.yy" /* yacc.c:1646 */
+#line 600 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.r_val_l_ptr) = (yyvsp[0].r_val_l_ptr);
}
-#line 1947 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1947 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 56:
-#line 604 "ce_expr.yy" /* yacc.c:1646 */
+#line 604 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.r_val_l_ptr) = 0;
}
-#line 1955 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1955 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 57:
-#line 610 "ce_expr.yy" /* yacc.c:1646 */
+#line 610 "ce_expr.yy" /* yacc.c:1661 */
{
BaseType *btp = DDS(arg)->var(www2id((yyvsp[0].id)));
if (btp) {
@@ -1993,11 +1993,11 @@ yyreduce:
(yyval.rval_ptr) = new rvalue(btp);
}
}
-#line 1997 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 1997 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 58:
-#line 648 "ce_expr.yy" /* yacc.c:1646 */
+#line 648 "ce_expr.yy" /* yacc.c:1661 */
{
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", "");
@@ -2016,11 +2016,11 @@ yyreduce:
// See ticket 2240. jhrg 7/30/14
delete (yyvsp[0].val).v.s;
}
-#line 2020 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2020 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 59:
-#line 672 "ce_expr.yy" /* yacc.c:1646 */
+#line 672 "ce_expr.yy" /* yacc.c:1661 */
{
if (!bracket_projection((*DDS(arg)), (yyvsp[-1].id), (yyvsp[0].int_ll_ptr)))
no_such_ident(arg, (yyvsp[-1].id), "array, grid or sequence");
@@ -2031,19 +2031,19 @@ yyreduce:
DDS(arg)->mark((yyvsp[-1].id), true);
(yyval.rval_ptr) = new rvalue(DDS(arg)->var((yyvsp[-1].id)));
}
-#line 2035 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2035 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 60:
-#line 685 "ce_expr.yy" /* yacc.c:1646 */
+#line 685 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (*DDS(arg)).mark((yyvsp[0].id), true);
}
-#line 2043 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2043 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 61:
-#line 691 "ce_expr.yy" /* yacc.c:1646 */
+#line 691 "ce_expr.yy" /* yacc.c:1661 */
{
//string name = www2id($1);
if (!bracket_projection((*DDS(arg)), (yyvsp[-1].id), (yyvsp[0].int_ll_ptr)))
@@ -2052,21 +2052,21 @@ yyreduce:
strncpy((yyval.id), (yyvsp[-1].id), ID_MAX-1);
(yyval.id)[ID_MAX-1] = '\0';
}
-#line 2056 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2056 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 62:
-#line 700 "ce_expr.yy" /* yacc.c:1646 */
+#line 700 "ce_expr.yy" /* yacc.c:1661 */
{
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 2066 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2066 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 63:
-#line 706 "ce_expr.yy" /* yacc.c:1646 */
+#line 706 "ce_expr.yy" /* yacc.c:1661 */
{
string name = string((yyvsp[-2].id)) + string((yyvsp[-1].id));
if (!bracket_projection((*DDS(arg)), name.c_str(), (yyvsp[0].int_ll_ptr)))
@@ -2075,20 +2075,20 @@ yyreduce:
strncpy((yyval.id), name.c_str(), ID_MAX-1);
(yyval.id)[ID_MAX-1] = '\0';
}
-#line 2079 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2079 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 64:
-#line 717 "ce_expr.yy" /* yacc.c:1646 */
+#line 717 "ce_expr.yy" /* yacc.c:1661 */
{
strncpy((yyval.id), www2id((yyvsp[0].id)).c_str(), ID_MAX-1);
(yyval.id)[ID_MAX-1] = '\0';
}
-#line 2088 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2088 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 65:
-#line 722 "ce_expr.yy" /* yacc.c:1646 */
+#line 722 "ce_expr.yy" /* yacc.c:1661 */
{
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", "");
@@ -2100,27 +2100,27 @@ yyreduce:
(yyval.id)[ID_MAX-1] = '\0';
}
-#line 2104 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2104 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 66:
-#line 736 "ce_expr.yy" /* yacc.c:1646 */
+#line 736 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.int_ll_ptr) = make_array_indices((yyvsp[0].int_l_ptr));
}
-#line 2112 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2112 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 67:
-#line 740 "ce_expr.yy" /* yacc.c:1646 */
+#line 740 "ce_expr.yy" /* yacc.c:1661 */
{
(yyval.int_ll_ptr) = append_array_index((yyvsp[-1].int_ll_ptr), (yyvsp[0].int_l_ptr));
}
-#line 2120 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2120 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 68:
-#line 754 "ce_expr.yy" /* yacc.c:1646 */
+#line 754 "ce_expr.yy" /* yacc.c:1661 */
{
if (!check_uint32((yyvsp[-1].id)))
throw Error(malformed_expr, "The word `" + string((yyvsp[-1].id)) + "' is not a valid array index.");
@@ -2129,22 +2129,22 @@ yyreduce:
i.v.i = atoi((yyvsp[-1].id));
(yyval.int_l_ptr) = make_array_index(i);
}
-#line 2133 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2133 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 69:
-#line 763 "ce_expr.yy" /* yacc.c:1646 */
+#line 763 "ce_expr.yy" /* yacc.c:1661 */
{
value i;
i.type = dods_int32_c;
i.v.i =-1;
(yyval.int_l_ptr) = make_array_index(i);
}
-#line 2144 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2144 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 70:
-#line 770 "ce_expr.yy" /* yacc.c:1646 */
+#line 770 "ce_expr.yy" /* yacc.c:1661 */
{
if (!check_uint32((yyvsp[-3].id)))
throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index.");
@@ -2156,11 +2156,11 @@ yyreduce:
j.v.i = atoi((yyvsp[-1].id));
(yyval.int_l_ptr) = make_array_index(i, j);
}
-#line 2160 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2160 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 71:
-#line 782 "ce_expr.yy" /* yacc.c:1646 */
+#line 782 "ce_expr.yy" /* yacc.c:1661 */
{
if (!check_uint32((yyvsp[-3].id)))
throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index.");
@@ -2171,11 +2171,11 @@ yyreduce:
j.v.i = -1;
(yyval.int_l_ptr) = make_array_index(i, j);
}
-#line 2175 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2175 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 72:
-#line 793 "ce_expr.yy" /* yacc.c:1646 */
+#line 793 "ce_expr.yy" /* yacc.c:1661 */
{
if (!check_uint32((yyvsp[-5].id)))
throw Error(malformed_expr, "The word `" + string((yyvsp[-5].id)) + "' is not a valid array index.");
@@ -2190,11 +2190,11 @@ yyreduce:
k.v.i = atoi((yyvsp[-1].id));
(yyval.int_l_ptr) = make_array_index(i, j, k);
}
-#line 2194 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2194 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
case 73:
-#line 808 "ce_expr.yy" /* yacc.c:1646 */
+#line 808 "ce_expr.yy" /* yacc.c:1661 */
{
if (!check_uint32((yyvsp[-5].id)))
throw Error(malformed_expr, "The word `" + string((yyvsp[-5].id)) + "' is not a valid array index.");
@@ -2208,11 +2208,11 @@ yyreduce:
k.v.i = -1;
(yyval.int_l_ptr) = make_array_index(i, j, k);
}
-#line 2212 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2212 "ce_expr.tab.cc" /* yacc.c:1661 */
break;
-#line 2216 "ce_expr.tab.cc" /* yacc.c:1646 */
+#line 2216 "ce_expr.tab.cc" /* yacc.c:1661 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/ce_expr.tab.hh b/ce_expr.tab.hh
index 77bf6b8..78a4d18 100644
--- a/ce_expr.tab.hh
+++ b/ce_expr.tab.hh
@@ -40,7 +40,7 @@
extern int ce_exprdebug;
#endif
/* "%code requires" blocks. */
-#line 41 "ce_expr.yy" /* yacc.c:1909 */
+#line 41 "ce_expr.yy" /* yacc.c:1915 */
#include "config.h"
@@ -136,7 +136,7 @@ template<class t, class T>
rvalue *build_constant_array(vector<t> *values, DDS *dds);
-#line 140 "ce_expr.tab.hh" /* yacc.c:1909 */
+#line 140 "ce_expr.tab.hh" /* yacc.c:1915 */
/* Token type. */
#ifndef YYTOKENTYPE
@@ -168,7 +168,7 @@ rvalue *build_constant_array(vector<t> *values, DDS *dds);
union YYSTYPE
{
-#line 145 "ce_expr.yy" /* yacc.c:1909 */
+#line 145 "ce_expr.yy" /* yacc.c:1915 */
bool boolean;
int op;
@@ -201,7 +201,7 @@ union YYSTYPE
libdap::rvalue *rval_ptr;
libdap::rvalue_list *r_val_l_ptr;
-#line 205 "ce_expr.tab.hh" /* yacc.c:1909 */
+#line 205 "ce_expr.tab.hh" /* yacc.c:1915 */
};
typedef union YYSTYPE YYSTYPE;
diff --git a/conf/._compile b/conf/._compile
new file mode 100755
index 0000000..784ae4b
Binary files /dev/null and b/conf/._compile differ
diff --git a/conf/._config.guess b/conf/._config.guess
new file mode 100755
index 0000000..784ae4b
Binary files /dev/null and b/conf/._config.guess differ
diff --git a/conf/._config.sub b/conf/._config.sub
new file mode 100755
index 0000000..784ae4b
Binary files /dev/null and b/conf/._config.sub differ
diff --git a/conf/._depcomp b/conf/._depcomp
new file mode 100755
index 0000000..784ae4b
Binary files /dev/null and b/conf/._depcomp differ
diff --git a/conf/._install-sh b/conf/._install-sh
new file mode 100755
index 0000000..784ae4b
Binary files /dev/null and b/conf/._install-sh differ
diff --git a/conf/._libtool.m4 b/conf/._libtool.m4
new file mode 100644
index 0000000..784ae4b
Binary files /dev/null and b/conf/._libtool.m4 differ
diff --git a/conf/._ltmain.sh b/conf/._ltmain.sh
new file mode 100755
index 0000000..784ae4b
Binary files /dev/null and b/conf/._ltmain.sh differ
diff --git a/conf/._ltoptions.m4 b/conf/._ltoptions.m4
new file mode 100644
index 0000000..784ae4b
Binary files /dev/null and b/conf/._ltoptions.m4 differ
diff --git a/conf/._ltsugar.m4 b/conf/._ltsugar.m4
new file mode 100644
index 0000000..784ae4b
Binary files /dev/null and b/conf/._ltsugar.m4 differ
diff --git a/conf/._ltversion.m4 b/conf/._ltversion.m4
new file mode 100644
index 0000000..784ae4b
Binary files /dev/null and b/conf/._ltversion.m4 differ
diff --git a/conf/._lt~obsolete.m4 b/conf/._lt~obsolete.m4
new file mode 100644
index 0000000..784ae4b
Binary files /dev/null and b/conf/._lt~obsolete.m4 differ
diff --git a/conf/._missing b/conf/._missing
new file mode 100755
index 0000000..784ae4b
Binary files /dev/null and b/conf/._missing differ
diff --git a/conf/._test-driver b/conf/._test-driver
new file mode 100755
index 0000000..784ae4b
Binary files /dev/null and b/conf/._test-driver differ
diff --git a/conf/compile b/conf/compile
index c0096a7..531136b 100755
--- a/conf/compile
+++ b/conf/compile
@@ -1,10 +1,9 @@
#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -29,21 +28,224 @@ scriptversion=2009-10-06.20; # UTC
# bugs to <bug-automake at gnu.org> or send patches to
# <automake-patches at gnu.org>.
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
case $1 in
'')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-automake at gnu.org>.
EOF
@@ -53,11 +255,13 @@ EOF
echo "compile $scriptversion"
exit $?
;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
esac
ofile=
cfile=
-eat=
for arg
do
@@ -66,8 +270,8 @@ do
else
case $1 in
-o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
@@ -94,10 +298,10 @@ do
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
+ # If no '-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
+ # '.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
@@ -106,7 +310,7 @@ fi
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
diff --git a/conf/config.guess b/conf/config.guess
index dc84c68..b79252d 100755
--- a/conf/config.guess
+++ b/conf/config.guess
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2009-11-20'
+timestamp='2013-06-10'
# This file 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
+# 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
@@ -17,26 +15,22 @@ timestamp='2009-11-20'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,8 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -394,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -480,8 +501,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +515,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -551,7 +572,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -594,52 +615,52 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +751,22 @@ EOF
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
@@ -769,14 +790,14 @@ EOF
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,30 +809,35 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
@@ -848,15 +874,22 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -866,52 +899,56 @@ EOF
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -930,51 +967,63 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
+ or1k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1032,11 @@ EOF
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
@@ -1019,7 +1068,7 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
@@ -1047,13 +1096,13 @@ EOF
exit ;;
pc:*:*:*)
# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
- exit ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
@@ -1088,8 +1137,8 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
@@ -1132,10 +1181,10 @@ EOF
echo ns32k-sni-sysv
fi
exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel at ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1210,11 @@ EOF
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
@@ -1178,6 +1227,9 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1204,19 +1256,21 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
+ eval $set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1230,7 +1284,10 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NEO-?:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1275,13 +1332,13 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
@@ -1299,11 +1356,11 @@ EOF
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
@@ -1321,11 +1378,11 @@ main ()
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#endif
diff --git a/conf/config.sub b/conf/config.sub
index 2a55a50..8b612ab 100755
--- a/conf/config.sub
+++ b/conf/config.sub
@@ -1,38 +1,31 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2009-11-20'
+timestamp='2013-04-24'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file 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
+# This file 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.
+# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -75,8 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -123,13 +115,18 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -152,12 +149,12 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
+ -bluegene*)
+ os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
@@ -173,10 +170,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -221,6 +218,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
@@ -245,20 +248,27 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -276,34 +286,45 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
- | nios | nios2 \
+ | nds32 | nds32le | nds32be \
+ | nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | or32 \
+ | open8 \
+ | or1k | or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -313,6 +334,21 @@ case $basic_machine in
basic_machine=mt-unknown
;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@@ -327,25 +363,30 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -363,29 +404,34 @@ case $basic_machine in
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
- | nios-* | nios2-* \
+ | nds32-* | nds32le-* | nds32be-* \
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
@@ -410,7 +456,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
- abacus)
+ abacus)
basic_machine=abacus-unknown
;;
adobe68k)
@@ -480,11 +526,20 @@ case $basic_machine in
basic_machine=powerpc-ibm
os=-cnk
;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
+ cegcc)
basic_machine=arm-unknown
os=-cegcc
;;
@@ -516,7 +571,7 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
+ cr16 | cr16-*)
basic_machine=cr16-unknown
os=-elf
;;
@@ -674,7 +729,6 @@ case $basic_machine in
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -732,9 +786,13 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=-mingw64
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -771,10 +829,18 @@ case $basic_machine in
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -839,6 +905,12 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -921,9 +993,10 @@ case $basic_machine in
;;
power) basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
@@ -948,7 +1021,11 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc
os=-rdos
;;
@@ -1017,6 +1094,9 @@ case $basic_machine in
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
@@ -1073,20 +1153,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tic55x | c55x*)
- basic_machine=tic55x-unknown
- os=-coff
- ;;
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1156,6 +1224,9 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
@@ -1253,11 +1324,11 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ -auroraux)
+ os=-auroraux
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1281,20 +1352,21 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1413,7 @@ case $os in
-opened*)
os=-openedition
;;
- -os400*)
+ -os400*)
os=-os400
;;
-wince*)
@@ -1390,7 +1462,7 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
+ -tpf*)
os=-tpf
;;
-triton*)
@@ -1426,15 +1498,14 @@ case $os in
-aros*)
os=-aros
;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe)
os=-zvmoe
;;
-dicos*)
os=-dicos
;;
+ -nacl*)
+ ;;
-none)
;;
*)
@@ -1457,10 +1528,10 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
+ score-*)
os=-elf
;;
- spu-*)
+ spu-*)
os=-elf
;;
*-acorn)
@@ -1472,8 +1543,20 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ hexagon-*)
+ os=-elf
+ ;;
+ tic54x-*)
+ os=-coff
+ ;;
+ tic55x-*)
+ os=-coff
+ ;;
+ tic6x-*)
+ os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1493,14 +1576,11 @@ case $basic_machine in
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
;;
- mep-*)
+ mep-*)
os=-elf
;;
mips*-cisco)
@@ -1509,6 +1589,9 @@ case $basic_machine in
mips*-*)
os=-elf
;;
+ or1k-*)
+ os=-elf
+ ;;
or32-*)
os=-coff
;;
@@ -1527,7 +1610,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
- *-knuth)
+ *-knuth)
os=-mmixware
;;
*-wec)
diff --git a/conf/depcomp b/conf/depcomp
index df8eea7..4ebd5b3 100755
--- a/conf/depcomp
+++ b/conf/depcomp
@@ -1,10 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC
case $1 in
'')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
-h | --h*)
cat <<\EOF
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -40,11 +39,11 @@ as side-effects.
Environment variables:
depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
+ source Source file read by 'PROGRAMS ARGS'.
+ object Object file output by 'PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
+ tmpdepfile Temporary file to use when outputting dependencies.
libtool Whether libtool is used (yes/no).
Report bugs to <bug-automake at gnu.org>.
@@ -57,6 +56,66 @@ EOF
;;
esac
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'. Note that this directory component will
+# be either empty or ending with a '/' character. This is deliberate.
+set_dir_from ()
+{
+ case $1 in
+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+ *) dir=;;
+ esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+ echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+ # If the compiler actually managed to produce a dependency file,
+ # post-process it.
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form 'foo.o: dependency.h'.
+ # Do two passes, one to just change these to
+ # $object: dependency.h
+ # and one to simply output
+ # dependency.h:
+ # which is needed to avoid the deleted-header problem.
+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+ } > "$depfile"
+ rm -f "$tmpdepfile"
+ else
+ make_dummy_depfile
+ fi
+}
+
+# A tabulation character.
+tab=' '
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
@@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -80,18 +142,32 @@ if test "$depmode" = hp; then
fi
if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u="sed s,\\\\\\\\,/,g"
- depmode=msvisualcpp
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
fi
case "$depmode" in
@@ -114,8 +190,7 @@ gcc3)
done
"$@"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -123,13 +198,17 @@ gcc3)
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
@@ -137,31 +216,31 @@ gcc)
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+ # The second -e expression handles DOS-style file names with drive
+ # letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
+## Some versions of gcc put a space before the ':'. On the theory
## that the space means something, we add a space to the output as
-## well.
+## well. hp depmode also adds that space, but also prefixes the VPATH
+## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -179,8 +258,7 @@ sgi)
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -188,43 +266,41 @@ sgi)
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
-
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
+ # the IRIX cc adds comments like '#:fec' to the end of the
# dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+ | tr "$nl" ' ' >> "$depfile"
echo >> "$depfile"
-
# The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile"
;;
+xlc)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
+ # current directory. Also, the AIX compiler puts '$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
@@ -237,9 +313,7 @@ aix)
"$@" -M
fi
stat=$?
-
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
@@ -248,44 +322,100 @@ aix)
do
test -f "$tmpdepfile" && break
done
- if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ aix_post_process_depfile
+ ;;
+
+tcc)
+ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+ # FIXME: That version still under development at the moment of writing.
+ # Make that this statement remains true also for stable, released
+ # versions.
+ # It will wrap lines (doesn't matter whether long or short) with a
+ # trailing '\', as in:
+ #
+ # foo.o : \
+ # foo.c \
+ # foo.h \
+ #
+ # It will put a trailing '\' even on the last line, and will use leading
+ # spaces rather than leading tabs (at least since its commit 0394caf7
+ # "Emit spaces for -MD").
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
fi
+ rm -f "$depfile"
+ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+ # We have to change lines of the first kind to '$object: \'.
+ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+ # And for each line of the second kind, we have to emit a 'dep.h:'
+ # dummy dependency, to avoid the deleted-header problem.
+ sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
# foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
+ # and will wrap long lines using '\' :
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
+ set_dir_from "$object"
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ set_base_from "$source"
+ tmpdepfile=$base.d
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir=$base.d-lock
+ trap "
+ echo '$0: caught signal, cleaning up...' >&2
+ rmdir '$lockdir'
+ exit 1
+ " 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0; do
+ # mkdir is a portable test-and-set.
+ if mkdir "$lockdir" 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rmdir "$lockdir"
+ break
+ else
+ # If the lock is being held by a different process, wait
+ # until the winning process is done or we timeout.
+ while test -d "$lockdir" && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -297,8 +427,8 @@ icc)
sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
# Some versions of the HPUX 10.20 sed can't process this invocation
# correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -309,9 +439,8 @@ hp2)
# 'foo.d', which lands next to the object file, wherever that
# happens to be.
# Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir.libs/$base.d
@@ -322,8 +451,7 @@ hp2)
"$@" +Maked
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
@@ -333,77 +461,107 @@ hp2)
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
+ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add 'dependent.h:' lines.
sed -ne '2,${
- s/^ *//
- s/ \\*$//
- s/$/:/
- p
- }' "$tmpdepfile" >> "$depfile"
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
else
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile" "$tmpdepfile2"
;;
tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ set_dir_from "$object"
+ set_base_from "$object"
+
+ if test "$libtool" = yes; then
+ # Libtool generates 2 separate objects for the 2 libraries. These
+ # two compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir$base.o.d # libtool 1.5
+ tmpdepfile2=$dir.libs/$base.o.d # Likewise.
+ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ # Same post-processing that is required for AIX mode.
+ aix_post_process_depfile
+ ;;
+
+msvc7)
+ if test "$libtool" = yes; then
+ showIncludes=-Wc,-showIncludes
+ else
+ showIncludes=-showIncludes
+ fi
+ "$@" $showIncludes > "$tmpdepfile"
+ stat=$?
+ grep -v '^Note: including file: ' "$tmpdepfile"
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ # The first sed program below extracts the file names and escapes
+ # backslashes for cygpath. The second sed program outputs the file
+ # name when reading, but also accumulates all include files in the
+ # hold buffer in order to output them again at the end. This only
+ # works with sed implementations that can handle large buffers.
+ sed < "$tmpdepfile" -n '
+/^Note: including file: *\(.*\)/ {
+ s//\1/
+ s/\\/\\\\/g
+ p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+ s/.*/'"$tab"'/
+ G
+ p
+}' >> "$depfile"
+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+ rm -f "$tmpdepfile"
+ ;;
+
+msvc7msys)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
#nosideeffect)
# This comment above is used by automake to tell side-effect
@@ -422,7 +580,7 @@ dashmstdout)
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
@@ -442,18 +600,18 @@ dashmstdout)
done
test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
+ # Require at least two characters before searching for ':'
# in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
"$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this sed invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -503,12 +661,15 @@ makedepend)
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # makedepend may prepend the VPATH from the source file name to the object.
+ # No need to regex-escape $object, excess matching of '.' is harmless.
+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process the last invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed '1,2d' "$tmpdepfile" \
+ | tr ' ' "$nl" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
@@ -525,7 +686,7 @@ cpp)
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
@@ -544,10 +705,10 @@ cpp)
esac
done
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
+ "$@" -E \
+ | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ | sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
@@ -579,23 +740,23 @@ msvisualcpp)
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
+ set fnord "$@"
+ shift
+ shift
+ ;;
*)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
+ set fnord "$@" "$arg"
+ shift
+ shift
+ ;;
esac
done
"$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+ echo "$tab" >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
diff --git a/conf/gcov_valgrind.m4 b/conf/gcov_valgrind.m4
index 98aa35a..c9649c2 100644
--- a/conf/gcov_valgrind.m4
+++ b/conf/gcov_valgrind.m4
@@ -15,6 +15,7 @@ AS_IF([test x$coverage = xyes],
[ CFLAGS="-fprofile-arcs -ftest-coverage -pg $CFLAGS"
CXXFLAGS="-fprofile-arcs -ftest-coverage -pg $CXXFLAGS"
LDFLAGS="-pg $LDFLAGS"
+ AC_CHECK_LIB([gcov], [gcov_open],[LIBS="$LIBS -lgcov"],[],[])
AC_MSG_NOTICE([Building coverage reporting.]) ],
[ AC_MSG_ERROR([Can only enable coverage when using gcc.]) ]) ])
diff --git a/conf/install-sh b/conf/install-sh
index 6781b98..377bb86 100755
--- a/conf/install-sh
+++ b/conf/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
shift;;
-T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
done
fi
@@ -194,13 +202,17 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call `install-sh -d' without argument.
+ # It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
for src
do
- # Protect names starting with `-'.
+ # Protect names problematic for 'test' and other utilities.
case $src in
- -*) src=./$src;;
+ -* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
-
dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst;;
- esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
@@ -347,7 +354,7 @@ do
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
+ # other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@ do
case $dstdir in
/*) prefix='/';;
- -*) prefix='./';;
+ [-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
@@ -403,7 +410,7 @@ do
for d
do
- test -z "$d" && continue
+ test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
diff --git a/conf/libtool.m4 b/conf/libtool.m4
index 671cde1..d812584 100644
--- a/conf/libtool.m4
+++ b/conf/libtool.m4
@@ -1,7 +1,8 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,7 +11,8 @@
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
-# serial 56 LT_INIT
+# serial 57 LT_INIT
# LT_PREREQ(VERSION)
@@ -66,6 +68,7 @@ esac
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
@@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
])
@@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
@@ -160,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
m4_require([_LT_CMD_RELOAD])dnl
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
@@ -179,7 +190,6 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
case $host_os in
aix3*)
@@ -193,23 +203,6 @@ aix3*)
;;
esac
-# 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.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -250,6 +243,28 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
@@ -408,7 +423,7 @@ m4_define([_lt_decl_all_varnames],
# 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 "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
# _LT_CONFIG_STATUS_DECLARATIONS
@@ -418,7 +433,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -517,12 +532,20 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -533,9 +556,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -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\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -543,16 +566,38 @@ for var in lt_decl_all_varnames([[ \
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
- ;;
-esac
-
_LT_OUTPUT_LIBTOOL_INIT
])
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# 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
+# 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).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
# ---------
@@ -562,20 +607,11 @@ _LT_OUTPUT_LIBTOOL_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
@@ -601,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -646,15 +682,13 @@ chmod +x "$CONFIG_LT"
# appending to config.log, which fails on DOS, as config.log is still kept
# 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.
-if test "$no_create" != yes; then
- lt_cl_success=:
- test "$silent" = yes &&
- 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
- exec AS_MESSAGE_LOG_FD>>config.log
- $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+ 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
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
])# LT_OUTPUT
@@ -717,15 +751,12 @@ _LT_EOF
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
- _LT_PROG_XSI_SHELLFNS
+ _LT_PROG_REPLACE_SHELLFNS
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" ||
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
@@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
dnl AC_DEFUN([AC_LIBTOOL_F77], [])
dnl AC_DEFUN([AC_LIBTOOL_FC], [])
dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
# _LT_TAG_COMPILER
@@ -940,6 +973,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+ [lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+ ])
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -967,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -987,7 +1045,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ 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\"`'
+ 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"
case $cc_basename in
@@ -995,7 +1057,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ 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}"
@@ -1011,203 +1073,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
fi
])
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
# Links a minimal program and checks the executable
# for the system default hardcoded library path. In most cases,
# this is /usr/lib:/lib, but when the MPI compilers are used
# the location of the communication and MPI libs are included too.
# If we don't find anything, use the default library path according
# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# 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
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+ lt_aix_libpath_sed='[
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }]'
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+ _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"
+ fi
+ ])
+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
])# _LT_SYS_MODULE_PATH_AIX
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
# _LT_PROG_ECHO_BACKSLASH
# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# 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).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-[$]*
-_LT_EOF
- exit 0
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
fi
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
+case "$ECHO" in
+ printf*) AC_MSG_RESULT([printf]) ;;
+ print*) AC_MSG_RESULT([print -r]) ;;
+ *) AC_MSG_RESULT([cat]) ;;
+esac
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test "X`printf %s $ECHO`" = "X$ECHO" \
+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-AC_SUBST(lt_ECHO)
-])
_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
- [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
])# _LT_PROG_ECHO_BACKSLASH
+# _LT_WITH_SYSROOT
+# ----------------
+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).],
+[], [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 #(
+ yes)
+ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ 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.])])
+
# _LT_ENABLE_LOCK
# ---------------
m4_defun([_LT_ENABLE_LOCK],
@@ -1236,7 +1237,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
@@ -1354,14 +1355,47 @@ need_locks="$enable_libtool_lock"
])# _LT_ENABLE_LOCK
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+ [lt_cv_ar_at_file=no
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+ [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
+ # 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
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+ ])
+ ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+ [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
# _LT_CMD_OLD_ARCHIVE
# -------------------
m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
@@ -1388,10 +1422,19 @@ if test -n "$RANLIB"; then
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
_LT_DECL([], [old_postinstall_cmds], [2])
_LT_DECL([], [old_postuninstall_cmds], [2])
_LT_TAGDECL([], [old_archive_cmds], [2],
[Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+ [Whether to use a lock for old archive extraction])
])# _LT_CMD_OLD_ARCHIVE
@@ -1416,15 +1459,15 @@ AC_CACHE_CHECK([$1], [$2],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -1464,7 +1507,7 @@ AC_CACHE_CHECK([$1], [$2],
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -1527,6 +1570,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -1591,8 +1639,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# 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"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -1643,7 +1691,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -1684,7 +1732,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1693,7 +1747,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -1869,16 +1927,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2037,6 +2095,7 @@ m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
@@ -2045,16 +2104,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ 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
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -2067,7 +2133,7 @@ if test "$GCC" = yes; then
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 '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -2087,7 +2153,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # 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'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
@@ -2175,7 +2247,7 @@ amigaos*)
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=`$ECHO "X$lib" | $Xsed -e '\''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%'\''`; 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'
;;
esac
;;
@@ -2206,8 +2278,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -2228,36 +2301,83 @@ cygwin* | mingw* | pw32* | cegcc*)
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}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+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}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
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}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ 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"
+ 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'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ 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'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -2344,6 +2464,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ 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'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -2386,8 +2519,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[[3-9]]*)
@@ -2445,7 +2580,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2454,29 +2589,31 @@ linux* | k*bsd*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+ [lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+ [lt_cv_shlibpath_overrides_runpath=yes])])
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+ ])
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# 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
- # 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
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;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ 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="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2708,6 +2845,8 @@ _LT_DECL([], [library_names_spec], [1],
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+ [Permission mode override for installation of shared libraries])
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
@@ -2820,6 +2959,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
@@ -2941,6 +3081,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -2949,8 +3094,8 @@ case $host_os in
fi
;;
esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
@@ -3002,16 +3147,18 @@ mingw* | pw32*)
# 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.
- if ( file / ) >/dev/null 2>&1; then
+ # 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
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3041,6 +3188,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -3049,11 +3200,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -3075,7 +3226,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3153,6 +3304,21 @@ tpf*)
;;
esac
])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3160,7 +3326,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
_LT_DECL([], [deplibs_check_method], [1],
[Method to check whether dependent libraries are shared objects])
_LT_DECL([], [file_magic_cmd], [1],
- [Command to use when deplibs_check_method == "file_magic"])
+ [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+ [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
])# _LT_CHECK_MAGIC_METHOD
@@ -3217,7 +3387,19 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+ 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
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -3230,13 +3412,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3251,6 +3433,67 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+# -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+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
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+ [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+ [lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+ MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
# LT_LIB_M
# --------
@@ -3259,7 +3502,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3287,7 +3530,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+ esac
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
@@ -3304,6 +3552,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
@@ -3371,8 +3620,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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 -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'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3408,6 +3657,7 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -3429,7 +3679,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -3441,6 +3691,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
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
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT@&t at _DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data. */
+# define LT@&t at _DLSYM_CONST
+#else
+# define LT@&t at _DLSYM_CONST const
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -3452,7 +3714,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-const struct {
+LT@&t at _DLSYM_CONST struct {
const char *name;
void *address;
}
@@ -3478,15 +3740,15 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
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
pipe_works=yes
fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
+ LIBS=$lt_globsym_save_LIBS
+ CFLAGS=$lt_globsym_save_CFLAGS
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
@@ -3519,6 +3781,13 @@ else
AC_MSG_RESULT(ok)
fi
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
+
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[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],
@@ -3529,6 +3798,8 @@ _LT_DECL([global_symbol_to_c_name_address],
_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_file_list_spec], [1],
+ [Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3540,7 +3811,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)=
-AC_MSG_CHECKING([for $compiler option to produce PIC])
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -3591,6 +3861,11 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -3640,6 +3915,12 @@ m4_if([$1], [CXX], [
;;
esac
;;
+ mingw* | cygwin* | os2* | pw32* | 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'])
+ ;;
dgux*)
case $cc_basename in
ec++*)
@@ -3696,7 +3977,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -3729,8 +4010,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xlc* | xlC*)
- # IBM XL 8.0 on PPC
+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3792,7 +4073,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -3896,6 +4177,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -3938,6 +4225,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -3980,7 +4274,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4001,7 +4295,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ 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'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4013,25 +4313,25 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
esac
;;
@@ -4063,7 +4363,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4120,9 +4420,11 @@ case $host_os in
_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
;;
esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- [How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
#
# Check to make sure the PIC flag actually works.
@@ -4141,6 +4443,8 @@ fi
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+ [How to pass a linker flag through the compiler])
#
# Check to make sure the static flag actually works.
#
@@ -4161,6 +4465,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
m4_defun([_LT_LINKER_SHLIBS],
[AC_REQUIRE([LT_PATH_LD])dnl
AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -4169,27 +4474,35 @@ m4_require([_LT_TAG_COMPILER])dnl
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
m4_if([$1], [CXX], [
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
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".
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")) && ([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) != ".")) { 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'
fi
;;
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
+ ;;
cygwin* | mingw* | cegcc*)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ case $cc_basename in
+ cl*) ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+ ;;
+ esac
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ ;;
esac
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4252,7 +4565,33 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
+
+ # 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
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4270,6 +4609,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
fi
supports_anon_versioning=no
case `$LD -v 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 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4285,11 +4625,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -4325,10 +4666,12 @@ _LT_EOF
# _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(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _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'
@@ -4346,6 +4689,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4361,7 +4709,7 @@ _LT_EOF
_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)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -4371,15 +4719,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=
+ 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; $ECHO \"$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*) # 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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ 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'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4390,13 +4739,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ 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(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; $ECHO \"$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
@@ -4412,17 +4765,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ 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)=
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; 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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4436,8 +4789,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _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(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
;;
@@ -4455,8 +4808,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _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(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
@@ -4502,8 +4855,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _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(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
@@ -4543,8 +4896,10 @@ _LT_EOF
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".
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")) && ([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) != ".")) { 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'
fi
@@ -4631,9 +4986,9 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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 "x${allow_undefined_flag}" != "x"; 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'
@@ -4642,14 +4997,19 @@ _LT_EOF
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_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'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ if test "$with_gnu_ld" = yes; 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'
+ 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'
@@ -4681,20 +5041,63 @@ _LT_EOF
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ case $cc_basename in
+ cl*)
+ # Native MSVC
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ 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='
+ # 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
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ # 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'
+ ;;
+ *)
+ # Assume MSVC wrapper
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ 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.
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4732,7 +5135,7 @@ _LT_EOF
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4740,7 +5143,7 @@ _LT_EOF
hpux9*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _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'
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'
fi
@@ -4755,8 +5158,8 @@ _LT_EOF
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 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'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -4774,16 +5177,16 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
_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 -fPIC ${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 -fPIC ${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
@@ -4795,7 +5198,14 @@ _LT_EOF
_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}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ m4_if($1, [], [
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (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)='$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'])
;;
esac
fi
@@ -4823,19 +5233,34 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _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.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(int foo(void) {},
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- )
- LDFLAGS="$save_LDFLAGS"
+ # 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"
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(
+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+ [C++], [[int foo (void) { return 0; }]],
+ [Fortran 77], [[
+ subroutine foo
+ end]],
+ [Fortran], [[
+ subroutine foo
+ 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'
+ fi
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -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" && $ECHO "X-set_version $verstring" | $Xsed` -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'
@@ -4897,17 +5322,17 @@ _LT_EOF
_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(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'
;;
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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _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" && $ECHO "X-set_version $verstring" | $Xsed` -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'
@@ -4917,13 +5342,13 @@ _LT_EOF
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} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -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'
@@ -4936,9 +5361,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _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 ${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"*)
@@ -5114,36 +5539,38 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+ [$RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+ then
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ else
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ ])
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
;;
esac
fi
@@ -5208,8 +5635,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
to runtime path list])
_LT_TAGDECL([], [link_all_deplibs], [0],
[Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
- [Fix the shell variable $srcfile for the compiler])
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5220,6 +5645,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+ [Commands necessary for finishing linking programs])
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
@@ -5313,37 +5740,22 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
# _LT_LANG_CXX_CONFIG([TAG])
# --------------------------
# 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'.
m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[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
+ AC_PROG_CXXCPP
+else
+ _lt_caught_CXX_error=yes
+fi
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5365,6 +5777,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5396,6 +5810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+ lt_save_CFLAGS=$CFLAGS
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
@@ -5413,6 +5828,7 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
+ CFLAGS=$CXXFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -5434,8 +5850,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -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(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'
@@ -5467,7 +5883,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
GXX=no
@@ -5576,10 +5992,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
- _LT_SYS_MODULE_PATH_AIX
+ _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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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 "x${allow_undefined_flag}" != "x"; 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'
@@ -5588,14 +6004,19 @@ if test "$_lt_caught_CXX_error" != yes; then
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_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'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ if test "$with_gnu_ld" = yes; 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'
+ 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.
@@ -5625,28 +6046,75 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
cygwin* | mingw* | pw32* | cegcc*)
- # _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(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'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
+ case $GXX,$cc_basename in
+ ,cl* | no,cl*)
+ # Native MSVC
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ 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='
+ # 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'
+ ;;
+ *)
+ # 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(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'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
@@ -5688,6 +6156,11 @@ if test "$_lt_caught_CXX_error" != yes; then
gnu*)
;;
+ haiku*)
+ _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_separator, $1)=:
@@ -5712,11 +6185,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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; $ECHO "X$list" | $Xsed'
+ 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 -fPIC ${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 -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'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5777,7 +6250,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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; $ECHO "X$list" | $Xsed'
+ 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
@@ -5787,10 +6260,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_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 -fPIC ${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 -fPIC ${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
@@ -5820,7 +6293,7 @@ if test "$_lt_caught_CXX_error" != yes; then
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" && $ECHO "X-set_version $verstring" | $Xsed` -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
@@ -5831,9 +6304,9 @@ if test "$_lt_caught_CXX_error" != yes; then
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -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"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -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
@@ -5844,7 +6317,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -5862,7 +6335,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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; $ECHO "X$list" | $Xsed'
+ 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'
@@ -5899,26 +6372,26 @@ if test "$_lt_caught_CXX_error" != yes; then
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+ *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 | $NL2SP`"'
+ 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 | $NL2SP`~
+ $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 | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $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 | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ $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 will use weak symbols
+ *) # 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'
;;
@@ -5926,7 +6399,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_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; $ECHO \"$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'
;;
cxx*)
# Compaq C++
@@ -5945,9 +6418,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "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*)
+ 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'
@@ -5967,13 +6440,13 @@ if test "$_lt_caught_CXX_error" != yes; then
_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; $ECHO \"$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
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
# would be better.
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6042,7 +6515,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_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=echo
+ output_verbose_link_cmd=func_echo_all
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6077,15 +6550,15 @@ if test "$_lt_caught_CXX_error" != yes; then
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" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -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 ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $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'
;;
@@ -6101,17 +6574,17 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 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}\*'
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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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 -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${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
@@ -6121,7 +6594,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -6157,7 +6630,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6178,7 +6651,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6198,14 +6671,14 @@ if test "$_lt_caught_CXX_error" != yes; then
if test "$GXX" = yes && test "$with_gnu_ld" = no; 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 -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 $LDFLAGS $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 -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 -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 "\-L"'
+ 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
# platform.
@@ -6216,7 +6689,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ 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'
@@ -6270,6 +6743,10 @@ if test "$_lt_caught_CXX_error" != yes; then
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(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6325,6 +6802,7 @@ if test "$_lt_caught_CXX_error" != yes; then
fi # test -n "$compiler"
CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
@@ -6339,6 +6817,29 @@ AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf 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).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+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}\$%%"`;;
+ esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -6347,6 +6848,7 @@ AC_LANG_POP
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
@@ -6397,6 +6899,13 @@ public class foo {
};
_LT_EOF
])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+esac
+
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
@@ -6408,7 +6917,7 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case $p in
+ case ${prev}${p} in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
@@ -6417,13 +6926,22 @@ if AC_TRY_EVAL(ac_compile); then
test $p = "-R"; then
prev=$p
continue
- else
- prev=
fi
+ # Expand the sysroot to ease extracting the directories later.
+ if test -z "$prev"; then
+ case $p in
+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+ esac
+ fi
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
+ 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.
@@ -6443,8 +6961,10 @@ if AC_TRY_EVAL(ac_compile); then
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
+ prev=
;;
+ *.lto.$objext) ;; # Ignore GCC LTO objects
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
@@ -6480,6 +7000,7 @@ else
fi
$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
@@ -6516,7 +7037,7 @@ linux*)
solaris*)
case $cc_basename in
- CC*)
+ 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
@@ -6560,32 +7081,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
# _LT_LANG_F77_CONFIG([TAG])
# --------------------------
# 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'.
m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6604,6 +7109,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6643,7 +7150,9 @@ if test "$_lt_disable_F77" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
+ CFLAGS=$FFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -6697,38 +7206,24 @@ if test "$_lt_disable_F77" != yes; then
GCC=$lt_save_GCC
CC="$lt_save_CC"
+ CFLAGS="$lt_save_CFLAGS"
fi # test "$_lt_disable_F77" != yes
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
# _LT_LANG_FC_CONFIG([TAG])
# -------------------------
# 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'.
m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6747,6 +7242,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6786,7 +7283,9 @@ if test "$_lt_disable_FC" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
+ CFLAGS=$FCFLAGS
compiler=$CC
GCC=$ac_cv_fc_compiler_gnu
@@ -6842,7 +7341,8 @@ if test "$_lt_disable_FC" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
@@ -6879,10 +7379,12 @@ _LT_COMPILER_BOILERPLATE
_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=yes
CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
@@ -6892,6 +7394,8 @@ _LT_CC_BASENAME([$compiler])
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6911,7 +7415,8 @@ fi
AC_LANG_RESTORE
GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
])# _LT_LANG_GCJ_CONFIG
@@ -6946,9 +7451,11 @@ _LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
CC=${RC-"windres"}
+CFLAGS=
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -6961,7 +7468,8 @@ fi
GCC=$lt_save_GCC
AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
])# _LT_LANG_RC_CONFIG
@@ -7020,6 +7528,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
AC_SUBST([OBJDUMP])
])
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
# _LT_DECL_SED
# ------------
@@ -7113,8 +7630,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,, \
+ 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
@@ -7153,208 +7670,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# 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 ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# 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 ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# 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_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}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $[*] ))
-}
+# _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=:
+])
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
+# _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##*/}"])
-# 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 ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
+ _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}"}])
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+ func_split_long_opt_name=${1%%=*}
+ func_split_long_opt_arg=${1#*=}])
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
+ _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"}])
-# 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 "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac])
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
+fi
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
+if test x"$lt_shell_append" = xyes; then
+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+ _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"])
-_LT_EOF
-esac
+ # 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
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
+if test x"$_lt_function_replace_fail" = x":"; then
+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which 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],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+ ;;
+ esac
;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+ *-*-cygwin* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+ ;;
+ esac
;;
- esac
+ * ) # unhandled hosts (and "normal" native builds)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+ [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ esac
+ ;;
+esac
])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+ [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/conf/ltmain.sh b/conf/ltmain.sh
index a72f2fd..3061e3c 100755
--- a/conf/ltmain.sh
+++ b/conf/ltmain.sh
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 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.
@@ -32,50 +32,56 @@
#
# 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
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print informational messages (default)
-# --version print version information
-# -h, --help print short or long help message
+# --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)
+# --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
+# 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.
+# 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.2.6b
-# automake: $automake_version
-# autoconf: $autoconf_version
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.4
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
-PROGRAM=ltmain.sh
+PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.2.6b
+VERSION=2.4
TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3293
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +97,15 @@ 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.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +118,33 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
$lt_unset CDPATH
+# 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"
: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${EGREP="grep -E"}
+: ${FGREP="grep -F"}
+: ${GREP="grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/bin/sed"}
+: ${SED="sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -144,6 +164,27 @@ 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
+
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
@@ -158,33 +199,183 @@ basename="s,^.*/,,"
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -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 "X${1}" | $Xsed -e "$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
+
+
+# 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
+
+
+# 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,/*$,/,'
+
+# 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
}
-# Generated shell functions inserted here.
+# 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
-# 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"
+ # 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
+
+ # 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
+}
# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
-case $progname in
- -*) progname=./$progname ;;
-esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@ -215,6 +406,15 @@ 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.
@@ -243,7 +443,7 @@ opt_warning=:
# name if it has been set yet.
func_echo ()
{
- $ECHO "$progname${mode+: }$mode: $*"
+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
}
# func_verbose arg...
@@ -258,18 +458,25 @@ func_verbose ()
:
}
+# 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${mode+: }$mode: "${1+"$@"} 1>&2
+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
}
# func_warning arg...
# Echo program name prefixed warning message to standard error.
func_warning ()
{
- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
# bash bug again:
:
@@ -326,9 +533,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -378,7 +585,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "X$my_tmpdir" | $Xsed
+ $ECHO "$my_tmpdir"
}
@@ -392,7 +599,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -419,7 +626,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "X$1" | $Xsed \
+ my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -488,15 +695,39 @@ func_show_eval_locale ()
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 ()
+{
+ 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
+}
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ $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/
@@ -509,22 +740,28 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
- $SED -n '/^# Usage:/,/# -h/ {
+ $opt_debug
+
+ $SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- $ECHO
+ echo
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
func_help ()
{
+ $opt_debug
+
$SED -n '/^# Usage:/,/# Report bugs to/ {
+ :print
s/^# //
s/^# *$//
s*\$progname*'$progname'*
@@ -537,8 +774,15 @@ func_help ()
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
- }' < "$progpath"
- exit $?
+ d
+ }
+ /^# .* home page:/b print
+ /^# General help using/b print
+ ' < "$progpath"
+ ret=$?
+ if test -z "$1"; then
+ exit $ret
+ fi
}
# func_missing_arg argname
@@ -546,63 +790,106 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
- func_error "missing argument for $1"
+ $opt_debug
+
+ func_error "missing argument for $1."
exit_cmd=exit
}
-exit_cmd=:
+# 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 ()
+{
+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ 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_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 ()
+{
+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+ my_sed_long_arg='1s/^--[^=]*=//'
+
+ 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
+
+exit_cmd=:
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
# Global variables.
-# $mode is unset
nonopt=
-execute_dlfiles=
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
# 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 ()
+{
+ eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# 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
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# 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
+
+
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
@@ -636,16 +923,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
- $ECHO "host: $host"
+ echo "host: $host"
if test "$build_libtool_libs" = yes; then
- $ECHO "enable shared libraries"
+ echo "enable shared libraries"
else
- $ECHO "disable shared libraries"
+ echo "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $ECHO "enable static libraries"
+ echo "enable static libraries"
else
- $ECHO "disable static libraries"
+ echo "disable static libraries"
fi
exit $?
@@ -692,117 +979,204 @@ func_enable_tag ()
esac
}
-# Parse options once, thoroughly. This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
+# 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
+$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
+$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
+$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
- # 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
+ 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
+
+
+
+# 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_verbose=:
+opt_silent=false
+opt_verbose=false
- # Parse non-mode specific arguments:
- while test "$#" -gt 0; do
+
+# 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
- --config) func_config ;;
-
- --debug) preserve_args="$preserve_args $opt"
+ --debug|-x) opt_debug='set -x'
func_echo "enabling shell trace mode"
- opt_debug='set -x'
$opt_debug
;;
-
- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
- execute_dlfiles="$execute_dlfiles $1"
- shift
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
;;
-
- --dry-run | -n) opt_dry_run=: ;;
- --features) func_features ;;
- --finish) mode="finish" ;;
-
- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
- 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 $opt"
- exit_cmd=exit
- break
- ;;
- esac
-
- mode="$1"
+ --config)
+ opt_config=:
+func_config
+ ;;
+ --dlopen|-dlopen)
+ optarg="$1"
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
shift
;;
-
--preserve-dup-deps)
- opt_duplicate_deps=: ;;
-
- --quiet|--silent) preserve_args="$preserve_args $opt"
- opt_silent=:
+ opt_preserve_dup_deps=:
;;
-
- --verbose| -v) preserve_args="$preserve_args $opt"
+ --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"
;;
-
- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
- preserve_args="$preserve_args $opt $1"
- func_enable_tag "$1" # tagname is set here
+ --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:
- -dlopen=*|--mode=*|--tag=*)
- func_opt_split "$opt"
- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+ --*=*)
+ func_split_long_opt "$opt"
+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
shift
;;
- -\?|-h) func_usage ;;
- --help) opt_help=: ;;
- --version) func_version ;;
-
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
-
- *) nonopt="$opt"
- break
+ # 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:
+
+ # save first non-option argument
+ if test "$#" -gt 0; then
+ nonopt="$opt"
+ shift
+ fi
+
+ # preserve --debug
+ test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -810,82 +1184,44 @@ func_enable_tag ()
opt_duplicate_compiler_generated_deps=:
;;
*)
- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
;;
esac
- # Having warned about all mis-specified options, bail out if
- # anything was wrong.
- $exit_cmd $EXIT_FAILURE
-}
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
-# 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
-$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
-$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
-$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
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
fi
- exit $EXIT_MISMATCH
- fi
-}
-
-
-## ----------- ##
-## Main. ##
-## ----------- ##
-
-$opt_help || {
- # Sanity checks first:
- func_check_version_match
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
- fi
+ # 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
+ fi
- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$progname --help --mode=$opt_mode' for more information."
+ }
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # Bail if the options were screwed
+ $exit_cmd $EXIT_FAILURE
+}
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$execute_dlfiles" && test "$mode" != execute; 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=$mode' for more information."
-}
+## ----------- ##
+## Main. ##
+## ----------- ##
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p ()
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
- func_ltwrapper_scriptname_result=""
- if func_ltwrapper_executable_p "$1"; then
- func_dirname_and_basename "$1" "" "."
- func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- fi
+ 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_p file
@@ -1001,6 +1334,37 @@ func_source ()
}
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot. Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+ func_resolve_sysroot_result=$1
+ case $func_resolve_sysroot_result in
+ =*)
+ func_stripname '=' '' "$func_resolve_sysroot_result"
+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+ ;;
+ esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+ case "$lt_sysroot:$1" in
+ ?*:"$lt_sysroot"*)
+ func_stripname "$lt_sysroot" '' "$1"
+ func_replace_sysroot_result="=$func_stripname_result"
+ ;;
+ *)
+ # Including no sysroot.
+ func_replace_sysroot_result=$1
+ ;;
+ esac
+}
+
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
@@ -1013,13 +1377,15 @@ func_infer_tag ()
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
- func_quote_for_eval "$arg"
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ func_append_quoted CC_quoted "$arg"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1030,11 +1396,13 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
- func_quote_for_eval "$arg"
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ func_append_quoted CC_quoted "$arg"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1097,6 +1465,486 @@ EOF
}
}
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+ $opt_debug
+ func_convert_core_file_wine_to_w32_result="$1"
+ if test -n "$1"; then
+ # Unfortunately, winepath does not exit with a non-zero error code, so we
+ # are forced to check the contents of stdout. On the other hand, if the
+ # command is not found, the shell will set an exit code of 127 and print
+ # *an error message* to stdout. So we must check for both error code of
+ # zero AND non-empty stdout, which explains the odd construction:
+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+ 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"`
+ else
+ func_convert_core_file_wine_to_w32_result=
+ fi
+ fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+ $opt_debug
+ # unfortunately, winepath doesn't convert paths, only file names
+ 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 -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"
+ else
+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+ fi
+ fi
+ done
+ IFS=$oldIFS
+ fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+ $opt_debug
+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+ if test "$?" -ne 0; then
+ # on failure, ensure result is empty
+ func_cygpath_result=
+ fi
+ else
+ func_cygpath_result=
+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format. Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+ $opt_debug
+ # 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"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+ $opt_debug
+ if test -z "$2" && test -n "$1" ; then
+ func_error "Could not determine host file name corresponding to"
+ func_error " \`$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_file_result="$1"
+ fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+ $opt_debug
+ if test -z "$4" && test -n "$3"; then
+ func_error "Could not determine the host path corresponding to"
+ 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.
+ if test "x$1" != "x$2"; then
+ lt_replace_pathsep_chars="s|$1|$2|g"
+ func_to_host_path_result=`echo "$3" |
+ $SED -e "$lt_replace_pathsep_chars"`
+ else
+ func_to_host_path_result="$3"
+ fi
+ fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+ $opt_debug
+ case $4 in
+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ ;;
+ esac
+ case $4 in
+ $2 ) func_append func_to_host_path_result "$3"
+ ;;
+ esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# 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.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+ $opt_debug
+ $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result. If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+ $opt_debug
+ case ,$2, in
+ *,"$to_tool_file_cmd",*)
+ func_to_tool_file_result=$1
+ ;;
+ *)
+ $to_tool_file_cmd "$1"
+ func_to_tool_file_result=$func_to_host_file_result
+ ;;
+ esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+ func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper. Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+ $opt_debug
+ 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"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format. Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+ $opt_debug
+ 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.
+ func_to_host_file_result=`cygpath -m "$1"`
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format. Requires a wine environment
+# 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"
+ 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"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+ $opt_debug
+ 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"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+ $opt_debug
+ 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"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# 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.
+#
+# Path separators are also converted from $build format to $host format. If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+# file name conversion function : func_convert_file_X_to_Y ()
+# path conversion function : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same. If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+ $opt_debug
+ 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}"
+ fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+ $opt_debug
+ func_init_to_host_path_cmd
+ $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+ func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper. Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+ $opt_debug
+ 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 ';.';
+ # and winepath ignores them completely.
+ 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_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format. Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+ $opt_debug
+ 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_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format. Requires a wine environment and
+# 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"
+ 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_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+ $opt_debug
+ 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_convert_path_check : : \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+ fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+ $opt_debug
+ 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 ';.', and winepath ignores them completely.
+ func_stripname : : "$1"
+ 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_convert_path_check : : \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+ fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
# func_mode_compile arg...
func_mode_compile ()
{
@@ -1137,12 +1985,12 @@ func_mode_compile ()
;;
-pie | -fpie | -fPIE)
- pie_flag="$pie_flag $arg"
+ func_append pie_flag " $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
- later="$later $arg"
+ func_append later " $arg"
continue
;;
@@ -1163,15 +2011,14 @@ func_mode_compile ()
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
- func_quote_for_eval "$arg"
- lastarg="$lastarg $func_quote_for_eval_result"
+ func_append_quoted lastarg "$arg"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
- base_compile="$base_compile $lastarg"
+ func_append base_compile " $lastarg"
continue
;;
@@ -1187,8 +2034,7 @@ func_mode_compile ()
esac # case $arg_mode
# Aesthetically quote the previous argument.
- func_quote_for_eval "$lastarg"
- base_compile="$base_compile $func_quote_for_eval_result"
+ func_append_quoted base_compile "$lastarg"
done # for arg
case $arg_mode in
@@ -1213,7 +2059,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -1288,7 +2134,7 @@ func_mode_compile ()
# 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 "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -1319,17 +2165,16 @@ compiler."
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- removelist="$removelist $output_obj"
+ func_append removelist " $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
- removelist="$removelist $lockfile"
+ func_append removelist " $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- if test -n "$fix_srcfile_path"; then
- eval srcfile=\"$fix_srcfile_path\"
- fi
+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+ srcfile=$func_to_tool_file_result
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
@@ -1349,7 +2194,7 @@ compiler."
if test -z "$output_obj"; then
# Place PIC objects in $objdir
- command="$command -o $lobj"
+ func_append command " -o $lobj"
fi
func_show_eval_locale "$command" \
@@ -1396,11 +2241,11 @@ compiler."
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
- command="$command -o $obj"
+ func_append command " -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
- command="$command$suppress_output"
+ func_append command "$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
@@ -1445,13 +2290,13 @@ compiler."
}
$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
- case $mode in
+ case $opt_mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
@@ -1482,10 +2327,11 @@ This mode accepts the following additional options:
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
+ -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
+ -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@ -1538,7 +2384,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
@@ -1558,6 +2404,8 @@ The following components of LINK-COMMAND are treated specially:
-all-static do not do any dynamic linking at all
-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
-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)
@@ -1586,6 +2434,11 @@ The following components of LINK-COMMAND are treated specially:
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
+ -Wc,FLAG
+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
+ -Wl,FLAG
+ -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.
@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$mode'"
+ func_fatal_help "invalid operation mode \`$opt_mode'"
;;
esac
- $ECHO
+ echo
$ECHO "Try \`$progname --help' for more information about other modes."
-
- exit $?
}
- # Now that we've collected a possible --mode arg, show help if necessary
- $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+ if test "$opt_help" = :; then
+ func_mode_help
+ else
+ {
+ func_help noexit
+ for opt_mode in compile link execute install finish uninstall clean; do
+ func_mode_help
+ done
+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ {
+ func_help noexit
+ for opt_mode in compile link execute install finish uninstall clean; do
+ echo
+ func_mode_help
+ done
+ } |
+ sed '1d
+ /^When reporting/,/^Report/{
+ H
+ d
+ }
+ $x
+ /information about other modes/d
+ /more detailed .*MODE/d
+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+ fi
+ exit $?
+fi
# func_mode_execute arg...
@@ -1643,13 +2522,16 @@ func_mode_execute ()
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
- for file in $execute_dlfiles; do
+ for file in $opt_dlopen; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
+ func_resolve_sysroot "$file"
+ file=$func_resolve_sysroot_result
+
# 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"
@@ -1671,7 +2553,7 @@ func_mode_execute ()
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
+ func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1712,7 +2594,7 @@ func_mode_execute ()
for file
do
case $file in
- -*) ;;
+ -* | *.la | *.lo ) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
@@ -1728,8 +2610,7 @@ func_mode_execute ()
;;
esac
# Quote arguments (to preserve shell metacharacters).
- func_quote_for_eval "$file"
- args="$args $func_quote_for_eval_result"
+ func_append_quoted args "$file"
done
if test "X$opt_dry_run" = Xfalse; then
@@ -1754,29 +2635,66 @@ func_mode_execute ()
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- $ECHO "export $shlibpath_var"
+ echo "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
fi
}
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+ $opt_debug
+ libs=
+ libdirs=
+ admincmds=
+
+ for opt in "$nonopt" ${1+"$@"}
+ do
+ if test -d "$opt"; then
+ func_append libdirs " $opt"
+
+ elif test -f "$opt"; then
+ if func_lalib_unsafe_p "$opt"; then
+ func_append libs " $opt"
+ else
+ func_warning "\`$opt' is not a valid libtool archive"
+ fi
+
+ else
+ func_fatal_error "invalid argument \`$opt'"
+ fi
+ done
+ if test -n "$libs"; then
+ if test -n "$lt_sysroot"; then
+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+ else
+ sysroot_cmd=
+ fi
-# func_mode_finish arg...
-func_mode_finish ()
-{
- $opt_debug
- libdirs="$nonopt"
- admincmds=
+ # Remove sysroot references
+ if $opt_dry_run; then
+ for lib in $libs; do
+ 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 \
+ > $tmpdir/tmp-la
+ mv -f $tmpdir/tmp-la $lib
+ done
+ ${RM}r "$tmpdir"
+ fi
+ fi
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- for dir
- do
- libdirs="$libdirs $dir"
- done
-
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -1786,7 +2704,7 @@ func_mode_finish ()
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+ $opt_dry_run || eval "$cmds" || func_append admincmds "
$cmds"
fi
done
@@ -1795,53 +2713,55 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- $ECHO "X----------------------------------------------------------------------" | $Xsed
- $ECHO "Libraries have been installed in:"
- for libdir in $libdirs; do
- $ECHO " $libdir"
- done
- $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 "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 " during execution"
- fi
- if test -n "$runpath_var"; then
- $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\"
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ echo "----------------------------------------------------------------------"
+ echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $ECHO " $libdir"
+ done
+ 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 "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 " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ 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"
- 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'"
- fi
- $ECHO
+ $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'"
+ fi
+ echo
- $ECHO "See any operating system documentation about shared libraries for"
- case $host in
- solaris2.[6789]|solaris2.1[0-9])
- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- $ECHO "pages."
- ;;
- *)
- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
- ;;
- esac
- $ECHO "X----------------------------------------------------------------------" | $Xsed
+ echo "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ echo "pages."
+ ;;
+ *)
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
+ ;;
+ esac
+ echo "----------------------------------------------------------------------"
+ fi
exit $EXIT_SUCCESS
}
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
@@ -1852,7 +2772,7 @@ func_mode_install ()
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ case $nonopt in *shtool*) :;; *) false;; esac; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -1866,7 +2786,12 @@ func_mode_install ()
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
- install_prog="$install_prog$func_quote_for_eval_result"
+ func_append install_prog "$func_quote_for_eval_result"
+ install_shared_prog=$install_prog
+ case " $install_prog " in
+ *[\\\ /]cp\ *) install_cp=: ;;
+ *) install_cp=false ;;
+ esac
# We need to accept at least all the BSD install flags.
dest=
@@ -1876,10 +2801,12 @@ func_mode_install ()
install_type=
isdir=no
stripme=
+ no_mode=:
for arg
do
+ arg2=
if test -n "$dest"; then
- files="$files $dest"
+ func_append files " $dest"
dest=$arg
continue
fi
@@ -1887,10 +2814,9 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
- case " $install_prog " in
- *[\\\ /]cp\ *) ;;
- *) prev=$arg ;;
- esac
+ if $install_cp; then :; else
+ prev=$arg
+ fi
;;
-g | -m | -o)
prev=$arg
@@ -1904,6 +2830,10 @@ func_mode_install ()
*)
# 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
+ arg2=$install_override_mode
+ no_mode=false
+ fi
prev=
else
dest=$arg
@@ -1914,7 +2844,11 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
- install_prog="$install_prog $func_quote_for_eval_result"
+ func_append install_prog " $func_quote_for_eval_result"
+ if test -n "$arg2"; then
+ func_quote_for_eval "$arg2"
+ fi
+ func_append install_shared_prog " $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -1923,6 +2857,13 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
+ if test -n "$install_override_mode" && $no_mode; then
+ if $install_cp; then :; else
+ func_quote_for_eval "$install_override_mode"
+ func_append install_shared_prog " -m $func_quote_for_eval_result"
+ fi
+ fi
+
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
@@ -1977,10 +2918,13 @@ func_mode_install ()
case $file in
*.$libext)
# Do the static libraries later.
- staticlibs="$staticlibs $file"
+ func_append staticlibs " $file"
;;
*.la)
+ func_resolve_sysroot "$file"
+ file=$func_resolve_sysroot_result
+
# 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"
@@ -1994,23 +2938,23 @@ func_mode_install ()
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
- *) current_libdirs="$current_libdirs $libdir" ;;
+ *) func_append current_libdirs " $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
- *) future_libdirs="$future_libdirs $libdir" ;;
+ *) func_append future_libdirs " $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
- dir="$dir$objdir"
+ func_append dir "$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@ -2023,9 +2967,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@ -2043,7 +2987,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@ -2083,7 +3027,7 @@ func_mode_install ()
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
;;
*.lo)
@@ -2183,7 +3127,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
@@ -2202,7 +3146,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@ -2221,7 +3165,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -2280,7 +3224,7 @@ func_mode_install ()
fi
}
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -2323,6 +3267,22 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
+#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
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT_DLSYM_CONST
+#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
+
/* External symbol declarations for the compiler. */\
"
@@ -2332,10 +3292,11 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
- func_verbose "extracting global C symbols from \`$progfile'"
- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+ 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
if test -n "$exclude_expsyms"; then
@@ -2371,7 +3332,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin | *mingw* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -2384,10 +3345,52 @@ extern \"C\" {
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
+ 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=""
+ 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
+ func_basename "$dlprefile_dlname"
+ dlprefile_dlbasename="$func_basename_result"
+ else
+ # no lafile. user explicitly requested -dlpreopen <import library>.
+ $sharedlib_from_linklib_cmd "$dlprefile"
+ dlprefile_dlbasename=$sharedlib_from_linklib_result
+ fi
+ fi
+ $opt_dry_run || {
+ if test -n "$dlprefile_dlbasename" ; then
+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+ else
+ func_warning "Could not compute DLL name from $name"
+ eval '$ECHO ": $name " >> "$nlist"'
+ fi
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+ }
+ else # not an import lib
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
+ fi
+ ;;
+ *)
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
+ ;;
+ esac
done
$opt_dry_run || {
@@ -2415,36 +3418,19 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
const char *name;
void *address;
} lt_dlsymlist;
-"
- case $host in
- *cygwin* | *mingw* | *cegcc* )
- $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
- runtime relocations are performed -- see ld's documentation
- on pseudo-relocs. */"
- lt_dlsym_const= ;;
- *osf5*)
- echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
- lt_dlsym_const= ;;
- *)
- lt_dlsym_const=const ;;
- esac
-
- $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
+extern LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup() {
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
- *) symtab_cflags="$symtab_cflags $arg" ;;
+ *) func_append symtab_cflags " $arg" ;;
esac
done
@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
fi
}
@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup() {
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
$opt_debug
@@ -2559,9 +3546,11 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
+ # 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 pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 |
+ $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 '
1,100{
/ I /{
@@ -2590,6 +3579,131 @@ func_win32_libid ()
$ECHO "$win32_libid_type"
}
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+# $sharedlib_from_linklib_cmd
+# Result is available in the variable
+# $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+ $opt_debug
+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+ $opt_debug
+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+ $SED '/^Contents of section '"$match_literal"':/{
+ # Place marker at beginning of archive member dllname section
+ s/.*/====MARK====/
+ p
+ d
+ }
+ # These lines can sometimes be longer than 43 characters, but
+ # are always uninteresting
+ /:[ ]*file format pe[i]\{,1\}-/d
+ /^In archive [^:]*:/d
+ # Ensure marker is printed
+ /^====MARK====/p
+ # Remove all lines with less than 43 characters
+ /^.\{43\}/!d
+ # From remaining lines, remove first 43 characters
+ s/^.\{43\}//' |
+ $SED -n '
+ # Join marker and all lines until next marker into a single line
+ /^====MARK====/ b para
+ H
+ $ b para
+ b
+ :para
+ x
+ s/\n//g
+ # Remove the marker
+ s/^====MARK====//
+ # Remove trailing dots and whitespace
+ s/[\. \t]*$//
+ # Print
+ /./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
+ # 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
+ # begins with a literal '.' or a single character followed by
+ # a '.'.
+ #
+ # Of those that remain, print the first one.
+ $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
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+# $sharedlib_from_linklib_cmd
+# Result is available in the variable
+# $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+ $opt_debug
+ 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
+ # ms-generated import library
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+ else
+ # unknown
+ sharedlib_from_linklib_result=""
+ fi
+}
# func_extract_an_archive dir oldlib
@@ -2598,7 +3712,18 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ if test "$lock_old_archive_extraction" = yes; 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"
+ sleep 2
+ done
+ 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
+ $opt_dry_run || rm -f "$lockfile"
+ fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -2669,7 +3794,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@ -2684,25 +3809,30 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
#
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
+# 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
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
{
- func_emit_wrapper_part1_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part1_arg1=$1
- fi
+ func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 ()
# 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='$sed_quote_subst'
# Be Bourne compatible
@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
- ECHO=\"$qecho\"
- file=\"\$0\"
- # Make sure echo works.
- if test \"X\$1\" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
- # Yippee, \$ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe \$ECHO will work.
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
- fi
- fi\
+ file=\"\$0\""
+
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+ $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+ ECHO=\"$qECHO\"
+ fi
+
+# 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
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+ lt_script_arg0=\$0
+ shift
+ for lt_opt
+ do
+ case \"\$lt_opt\" in
+ --lt-debug) lt_option_debug=1 ;;
+ --lt-dump-script)
+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+ cat \"\$lt_dump_D/\$lt_dump_F\"
+ exit 0
+ ;;
+ --lt-*)
+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+ exit 1
+ ;;
+ esac
+ done
+
+ # Print the debug banner immediately:
+ if test -n \"\$lt_option_debug\"; then
+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+ lt_dump_args_N=1;
+ for lt_arg
+ do
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+ done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
"
- $ECHO "\
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done
+ func_exec_program_core \${1+\"\$@\"}
+}
+
+ # Parse options
+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
while test -n \"\$file\"; do
- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +4013,13 @@ else
esac
fi
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
- func_emit_wrapper_part2_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part2_arg1=$1
- fi
-
- $ECHO "\
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 ()
if test -f \"\$progdir/\$program\"; then"
+ # fixup the dll searchpath if we need to.
+ #
+ # Fix the DLL searchpath if we need to. Do this before prepending
+ # to shlibpath, because on Windows, both are PATH and uninstalled
+ # libraries must come first.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
@@ -2877,253 +4102,28 @@ func_emit_wrapper_part2 ()
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
export $shlibpath_var
"
fi
- # fixup the dll searchpath if we need to.
- if test -n "$dllsearchpath"; then
- $ECHO "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
- fi
-
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
-"
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
- ;;
-
- *)
- $ECHO "\
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
- ;;
- esac
- $ECHO "\
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- exit 1
+ func_exec_program \${1+\"\$@\"}
fi
else
# The program doesn't exist.
\$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
+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
fi
fi\
"
}
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable. Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# 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
-# the $objdir directory. This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
- func_emit_wrapper_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_arg1=$1
- fi
-
- # split this up so that func_emit_cwrapperexe_src
- # can call each part independently.
- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-# $build $host
-# mingw (msys) mingw [e.g. native]
-# cygwin mingw
-# *nix + wine mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin. Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
- func_to_host_path_result="$1"
- if test -n "$1" ; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- case $build in
- *mingw* ) # actually, msys
- # awkward: cmd appends spaces to result
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
- func_to_host_path_tmp1=`cygpath -w "$1"`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # Unfortunately, winepath does not exit with a non-zero
- # error code, so we are forced to check the contents of
- # stdout. On the other hand, if the command is not
- # found, the shell will set an exit code of 127 and print
- # *an error message* to stdout. So we must check for both
- # error code of zero AND non-empty stdout, which explains
- # the odd construction:
- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- else
- # Allow warning below.
- func_to_host_path_result=""
- fi
- ;;
- esac
- if test -z "$func_to_host_path_result" ; then
- func_error "Could not determine host path corresponding to"
- func_error " '$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback:
- func_to_host_path_result="$1"
- fi
- ;;
- esac
- fi
-}
-# end: func_to_host_path
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-# $build $host
-# mingw (msys) mingw [e.g. native]
-# cygwin mingw
-# *nix + wine mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
- func_to_host_pathlist_result="$1"
- if test -n "$1" ; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- # Remove leading and trailing path separator characters from
- # ARG. msys behavior is inconsistent here, cygpath turns them
- # into '.;' and ';.', and winepath ignores them completely.
- func_to_host_pathlist_tmp2="$1"
- # Once set for this call, this variable should not be
- # reassigned. It is used in tha fallback case.
- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e 's|^:*||' -e 's|:*$||'`
- case $build in
- *mingw* ) # Actually, msys.
- # Awkward: cmd appends spaces to result.
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # unfortunately, winepath doesn't convert pathlists
- func_to_host_pathlist_result=""
- func_to_host_pathlist_oldIFS=$IFS
- IFS=:
- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
- IFS=$func_to_host_pathlist_oldIFS
- if test -n "$func_to_host_pathlist_f" ; then
- func_to_host_path "$func_to_host_pathlist_f"
- if test -n "$func_to_host_path_result" ; then
- if test -z "$func_to_host_pathlist_result" ; then
- func_to_host_pathlist_result="$func_to_host_path_result"
- else
- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
- fi
- fi
- fi
- IFS=:
- done
- IFS=$func_to_host_pathlist_oldIFS
- ;;
- esac
- if test -z "$func_to_host_pathlist_result" ; then
- func_error "Could not determine the host path(s) corresponding to"
- func_error " '$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback. This may break if $1 contains DOS-style drive
- # specifications. The fix is not to complicate the expression
- # below, but for the user to provide a working wine installation
- # with winepath so that path translation in the cross-to-mingw
- # case works properly.
- lt_replace_pathsep_nix_to_dos="s|:|;|g"
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_replace_pathsep_nix_to_dos"`
- fi
- # Now, add the leading and trailing path separators back
- case "$1" in
- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
- ;;
- esac
- case "$1" in
- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
- ;;
- esac
- ;;
- esac
- fi
-}
-# end: func_to_host_pathlist
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
@@ -3141,31 +4141,23 @@ func_emit_cwrapperexe_src ()
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-
- Currently, it simply execs the wrapper *script* "$SHELL $output",
- but could eventually absorb all of the scripts functionality and
- exec $objdir/$outputname directly.
*/
EOF
cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
# include <direct.h>
# include <process.h>
# include <io.h>
-# define setmode _setmode
#else
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
# include <io.h>
-# define HAVE_SETENV
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
# endif
#endif
#include <malloc.h>
@@ -3177,6 +4169,44 @@ int setenv (const char *, const char *, int);
#include <fcntl.h>
#include <sys/stat.h>
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#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) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#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__)
+# define setmode _setmode
+# define stat _stat
+# define chmod _chmod
+# define getcwd _getcwd
+# define putenv _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *, int);
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
- va_list args;
- va_start (args, fmt);
- (void) vfprintf (stderr, fmt, args);
- va_end (args);
-}
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
#else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
#endif
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@ -3271,41 +4281,27 @@ char *chase_symlinks (const char *pathspec);
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
void lt_setenv (const char *name, const char *value);
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
void lt_update_exe_path (const char *name, const char *value);
void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
- func_emit_wrapper_part1 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
- cat <<EOF
-
-static const char *script_text_part2 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
EOF
- func_emit_wrapper_part2 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
+volatile const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- func_to_host_pathlist "$temp_rpath"
+ func_to_host_path "$temp_rpath"
cat <<EOF
-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
EOF
else
cat <<"EOF"
@@ -3314,10 +4310,10 @@ EOF
fi
if test -n "$dllsearchpath"; then
- func_to_host_pathlist "$dllsearchpath:"
+ func_to_host_path "$dllsearchpath:"
cat <<EOF
const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
EOF
else
cat <<"EOF"
@@ -3340,24 +4336,10 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
- /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
int
main (int argc, char *argv[])
@@ -3374,10 +4356,13 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+ newargz = XMALLOC (char *, argc + 1);
- /* very simple arg parsing; don't want to rely on getopt */
+ /* very simple arg parsing; don't want to rely on getopt
+ * also, copy all non cwrapper options to newargz, except
+ * argz[0], which is handled differently
+ */
+ newargc=0;
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3391,25 +4376,57 @@ EOF
esac
cat <<"EOF"
- printf ("%s", script_text_part1);
- printf ("%s", script_text_part2);
+ lt_dump_script (stdout);
return 0;
}
+ if (strcmp (argv[i], debug_opt) == 0)
+ {
+ lt_debug = 1;
+ continue;
+ }
+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ {
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+ namespace, but it is not one of the ones we know about and
+ have already dealt with, above (inluding dump-script), then
+ report an error. Otherwise, targets might begin to believe
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+ namespace. The first time any user complains about this, we'll
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+ or a configure.ac-settable value.
+ */
+ lt_fatal (__FILE__, __LINE__,
+ "unrecognized %s option: '%s'",
+ ltwrapper_option_prefix, argv[i]);
+ }
+ /* otherwise ... */
+ newargz[++newargc] = xstrdup (argv[i]);
}
+ newargz[++newargc] = NULL;
+
+EOF
+ cat <<EOF
+ /* The GNU banner must be the first non-error debug message */
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+ cat <<"EOF"
+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- newargz = XMALLOC (char *, argc + 1);
tmp_pathspec = find_executable (argv[0]);
if (tmp_pathspec == NULL)
- lt_fatal ("Couldn't find %s", argv[0]);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
- tmp_pathspec));
+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (before symlink chase) at: %s\n",
+ tmp_pathspec);
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
- actual_cwrapper_path));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (after symlink chase) at: %s\n",
+ actual_cwrapper_path);
XFREE (tmp_pathspec);
- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
@@ -3427,8 +4444,9 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
- target_name));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) libtool target name: %s\n",
+ target_name);
EOF
cat <<EOF
@@ -3478,80 +4496,19 @@ EOF
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+ because on Windows, both *_VARNAMEs are PATH but uninstalled
+ libraries must come first. */
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- newargc=0;
- for (i = 1; i < argc; i++)
- {
- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
- {
- if (argv[i][env_set_opt_len] == '=')
- {
- const char *p = argv[i] + env_set_opt_len + 1;
- lt_opt_process_env_set (p);
- }
- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_set (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_set_opt);
- continue;
- }
- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
- {
- if (argv[i][env_prepend_opt_len] == '=')
- {
- const char *p = argv[i] + env_prepend_opt_len + 1;
- lt_opt_process_env_prepend (p);
- }
- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_prepend_opt);
- continue;
- }
- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
- {
- if (argv[i][env_append_opt_len] == '=')
- {
- const char *p = argv[i] + env_append_opt_len + 1;
- lt_opt_process_env_append (p);
- }
- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_append (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_append_opt);
- continue;
- }
- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
- {
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- namespace, but it is not one of the ones we know about and
- have already dealt with, above (inluding dump-script), then
- report an error. Otherwise, targets might begin to believe
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- namespace. The first time any user complains about this, we'll
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- or a configure.ac-settable value.
- */
- lt_fatal ("Unrecognized option in %s namespace: '%s'",
- ltwrapper_option_prefix, argv[i]);
- }
- /* otherwise ... */
- newargz[++newargc] = xstrdup (argv[i]);
- }
- newargz[++newargc] = NULL;
-
- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+ nonnull (lt_argv_zero));
for (i = 0; i < newargc; i++)
{
- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+ i, nonnull (newargz[i]));
}
EOF
@@ -3560,11 +4517,14 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
+ newargz = prepare_spawn (newargz);
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) failed to launch target \"%s\": %s\n",
+ lt_argv_zero, nonnull (strerror (errno)));
return 127;
}
return rval;
@@ -3586,7 +4546,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal ("Memory exhausted");
+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
return p;
}
@@ -3620,8 +4580,8 @@ check_executable (const char *path)
{
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3638,8 +4598,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+ nonempty (wrapper));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
- tmp_pathspec));
+ lt_debugprintf (__FILE__, __LINE__,
+ "checking path component for symlinks: %s\n",
+ tmp_pathspec);
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec)
}
else
{
- char *errstr = strerror (errno);
- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ lt_fatal (__FILE__, __LINE__,
+ "error accessing file \"%s\": %s",
+ tmp_pathspec, nonnull (strerror (errno)));
}
}
XFREE (tmp_pathspec);
@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal ("Could not follow symlinks for %s", pathspec);
+ lt_fatal (__FILE__, __LINE__,
+ "could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat)
return str;
}
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+ va_list args;
+ if (lt_debug)
+ {
+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+ }
+}
+
static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+ int line, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s: %s: ", program_name, mode);
+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const char *mode,
}
void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
va_end (ap);
}
+static const char *
+nonnull (const char *s)
+{
+ return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+ return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
void
lt_setenv (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_setenv) setting '%s' to '%s'\n",
+ nonnull (name), nonnull (value));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
return new_value;
}
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
- const char *p;
- int len;
- if (!arg || !*arg)
- return 1;
-
- p = strchr (arg, (int)'=');
-
- if (!p)
- return 1;
-
- *value = xstrdup (++p);
-
- len = strlen (arg) - strlen (*value);
- *name = XMALLOC (char, len);
- strncpy (*name, arg, len-1);
- (*name)[len - 1] = '\0';
-
- return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
- }
-
- lt_setenv (name, value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 0);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 1);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
void
lt_update_exe_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, const char *value)
}
}
+EOF
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+ Note that spawn() does not by itself call the command interpreter
+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ GetVersionEx(&v);
+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+ }) ? "cmd.exe" : "command.com").
+ Instead it simply concatenates the arguments, separated by ' ', and calls
+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+ special way:
+ - Space and tab are interpreted as delimiters. They are not treated as
+ delimiters if they are surrounded by double quotes: "...".
+ - Unescaped double quotes are removed from the input. Their only effect is
+ that within double quotes, space and tab are treated like normal
+ characters.
+ - Backslashes not followed by double quotes are not special.
+ - But 2*n+1 backslashes followed by a double quote become
+ n backslashes followed by a double quote (n >= 0):
+ \" -> "
+ \\\" -> \"
+ \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+ size_t argc;
+ char **new_argv;
+ size_t i;
+
+ /* Count number of arguments. */
+ for (argc = 0; argv[argc] != NULL; argc++)
+ ;
+
+ /* Allocate new argument vector. */
+ new_argv = XMALLOC (char *, argc + 1);
+
+ /* Put quoted arguments into the new argument vector. */
+ for (i = 0; i < argc; i++)
+ {
+ const char *string = argv[i];
+
+ if (string[0] == '\0')
+ new_argv[i] = xstrdup ("\"\"");
+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+ {
+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+ size_t length;
+ unsigned int backslashes;
+ const char *s;
+ char *quoted_string;
+ char *p;
+
+ length = 0;
+ backslashes = 0;
+ if (quote_around)
+ length++;
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ length += backslashes + 1;
+ length++;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ length += backslashes + 1;
+
+ quoted_string = XMALLOC (char, length + 1);
+
+ p = quoted_string;
+ backslashes = 0;
+ if (quote_around)
+ *p++ = '"';
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ {
+ unsigned int j;
+ for (j = backslashes + 1; j > 0; j--)
+ *p++ = '\\';
+ }
+ *p++ = c;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ {
+ unsigned int j;
+ for (j = backslashes; j > 0; j--)
+ *p++ = '\\';
+ *p++ = '"';
+ }
+ *p = '\0';
+
+ new_argv[i] = quoted_string;
+ }
+ else
+ new_argv[i] = (char *) string;
+ }
+ new_argv[argc] = NULL;
+
+ return new_argv;
+}
+EOF
+ ;;
+ esac
+
+ cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+ func_emit_wrapper yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
+ cat <<"EOF"
+}
EOF
}
# end: func_emit_cwrapperexe_src
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+ $opt_debug
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+ *import*) : ;;
+ *) false ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
@@ -4072,6 +5121,7 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
+ bindir=
dlfiles=
dlprefiles=
dlself=no
@@ -4164,6 +5214,11 @@ func_mode_link ()
esac
case $prev in
+ bindir)
+ bindir="$arg"
+ prev=
+ continue
+ ;;
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
@@ -4195,9 +5250,9 @@ func_mode_link ()
;;
*)
if test "$prev" = dlfiles; then
- dlfiles="$dlfiles $arg"
+ func_append dlfiles " $arg"
else
- dlprefiles="$dlprefiles $arg"
+ func_append dlprefiles " $arg"
fi
prev=
continue
@@ -4221,7 +5276,7 @@ func_mode_link ()
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
;;
esac
;;
@@ -4240,7 +5295,7 @@ func_mode_link ()
moreargs=
for fil in `cat "$save_arg"`
do
-# moreargs="$moreargs $fil"
+# func_append moreargs " $fil"
arg=$fil
# A libtool-controlled object.
@@ -4269,7 +5324,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
+ func_append dlfiles " $pic_object"
prev=
continue
else
@@ -4281,7 +5336,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
+ func_append dlprefiles " $pic_object"
prev=
fi
@@ -4351,12 +5406,12 @@ func_mode_link ()
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
- *) rpath="$rpath $arg" ;;
+ *) func_append rpath " $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
- *) xrpath="$xrpath $arg" ;;
+ *) func_append xrpath " $arg" ;;
esac
fi
prev=
@@ -4368,28 +5423,28 @@ func_mode_link ()
continue
;;
weak)
- weak_libs="$weak_libs $arg"
+ func_append weak_libs " $arg"
prev=
continue
;;
xcclinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $qarg"
+ func_append linker_flags " $qarg"
+ func_append compiler_flags " $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xcompiler)
- compiler_flags="$compiler_flags $qarg"
+ func_append compiler_flags " $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xlinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $wl$qarg"
+ func_append linker_flags " $qarg"
+ func_append compiler_flags " $wl$qarg"
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
@@ -4425,6 +5480,11 @@ func_mode_link ()
continue
;;
+ -bindir)
+ prev=bindir
+ continue
+ ;;
+
-dlopen)
prev=dlfiles
continue
@@ -4475,15 +5535,16 @@ func_mode_link ()
;;
-L*)
- func_stripname '-L' '' "$arg"
- dir=$func_stripname_result
- if test -z "$dir"; then
+ 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'"
else
func_fatal_error "need path for \`-L' option"
fi
fi
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -4495,24 +5556,30 @@ func_mode_link ()
;;
esac
case "$deplibs " in
- *" -L$dir "*) ;;
+ *" -L$dir "* | *" $arg "*)
+ # Will only happen for absolute or sysroot arguments
+ ;;
*)
- deplibs="$deplibs -L$dir"
- lib_search_path="$lib_search_path $dir"
+ # Preserve sysroot, but never include relative directories
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+ *) func_append deplibs " -L$dir" ;;
+ esac
+ func_append lib_search_path " $dir"
;;
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
- *) dllsearchpath="$dllsearchpath:$dir";;
+ *) func_append dllsearchpath ":$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
+ *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
@@ -4522,7 +5589,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -4536,7 +5603,7 @@ func_mode_link ()
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- deplibs="$deplibs System.ltframework"
+ func_append deplibs " System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
@@ -4556,7 +5623,7 @@ func_mode_link ()
;;
esac
fi
- deplibs="$deplibs $arg"
+ func_append deplibs " $arg"
continue
;;
@@ -4568,8 +5635,8 @@ func_mode_link ()
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
- -model|-arch|-isysroot)
- compiler_flags="$compiler_flags $arg"
+ -model|-arch|-isysroot|--sysroot)
+ func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
@@ -4577,12 +5644,12 @@ func_mode_link ()
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
+ func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+ * ) func_append new_inherited_linker_flags " $arg" ;;
esac
continue
;;
@@ -4649,13 +5716,17 @@ func_mode_link ()
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
+ =*)
+ func_stripname '=' '' "$dir"
+ dir=$lt_sysroot$func_stripname_result
+ ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
*" $dir "*) ;;
- *) xrpath="$xrpath $dir" ;;
+ *) func_append xrpath " $dir" ;;
esac
continue
;;
@@ -4708,8 +5779,8 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
- compiler_flags="$compiler_flags $func_quote_for_eval_result"
+ func_append arg " $func_quote_for_eval_result"
+ func_append compiler_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -4724,9 +5795,9 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
- linker_flags="$linker_flags $func_quote_for_eval_result"
+ 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"
func_stripname ' ' '' "$arg"
@@ -4754,23 +5825,27 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
- # -r[0-9][0-9]* specifies the processor on the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
- # +DA*, +DD* enable 64-bit mode on the HP compiler
- # -q* pass through compiler args for the IBM compiler
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+ # Flags to be passed through unchanged, with rationale:
+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
+ # -r[0-9][0-9]* specify processor for the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+ # +DA*, +DD* enable 64-bit mode for the HP compiler
+ # -q* compiler args for the IBM compiler
+ # -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
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
+ # --sysroot=* for sysroot support
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
func_append finalize_command " $arg"
- compiler_flags="$compiler_flags $arg"
+ func_append compiler_flags " $arg"
continue
;;
@@ -4782,7 +5857,7 @@ func_mode_link ()
*.$objext)
# A standard object.
- objs="$objs $arg"
+ func_append objs " $arg"
;;
*.lo)
@@ -4813,7 +5888,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
+ func_append dlfiles " $pic_object"
prev=
continue
else
@@ -4825,7 +5900,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
+ func_append dlprefiles " $pic_object"
prev=
fi
@@ -4870,24 +5945,25 @@ func_mode_link ()
*.$libext)
# An archive.
- deplibs="$deplibs $arg"
- old_deplibs="$old_deplibs $arg"
+ func_append deplibs " $arg"
+ func_append old_deplibs " $arg"
continue
;;
*.la)
# A libtool-controlled library.
+ func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
- dlfiles="$dlfiles $arg"
+ func_append dlfiles " $func_resolve_sysroot_result"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
- dlprefiles="$dlprefiles $arg"
+ func_append dlprefiles " $func_resolve_sysroot_result"
prev=
else
- deplibs="$deplibs $arg"
+ func_append deplibs " $func_resolve_sysroot_result"
fi
continue
;;
@@ -4925,7 +6001,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@ -4934,6 +6010,8 @@ func_mode_link ()
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
+ func_to_tool_file "$output_objdir/"
+ tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
func_mkdir_p "$output_objdir"
@@ -4954,12 +6032,12 @@ func_mode_link ()
# 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_duplicate_deps ; then
+ if $opt_preserve_dup_deps ; then
case "$libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- libs="$libs $deplib"
+ func_append libs " $deplib"
done
if test "$linkmode" = lib; then
@@ -4972,9 +6050,9 @@ func_mode_link ()
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
esac
- pre_post_deps="$pre_post_deps $pre_post_dep"
+ func_append pre_post_deps " $pre_post_dep"
done
fi
pre_post_deps=
@@ -5041,17 +6119,19 @@ func_mode_link ()
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
+ func_resolve_sysroot "$lib"
case $lib in
- *.la) func_source "$lib" ;;
+ *.la) func_source "$func_resolve_sysroot_result" ;;
esac
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ func_basename "$deplib"
+ deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
- *) deplibs="$deplibs $deplib" ;;
+ *) func_append deplibs " $deplib" ;;
esac
done
done
@@ -5072,11 +6152,11 @@ func_mode_link ()
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- compiler_flags="$compiler_flags $deplib"
+ func_append compiler_flags " $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
@@ -5161,7 +6241,7 @@ func_mode_link ()
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
@@ -5174,7 +6254,8 @@ func_mode_link ()
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
if test "$pass" = conv; then
@@ -5188,7 +6269,8 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
@@ -5199,17 +6281,21 @@ func_mode_link ()
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
- dir=$func_stripname_result
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
- *) xrpath="$xrpath $dir" ;;
+ *) func_append xrpath " $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
continue
;;
- *.la) lib="$deplib" ;;
+ *.la)
+ func_resolve_sysroot "$deplib"
+ lib=$func_resolve_sysroot_result
+ ;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
@@ -5227,7 +6313,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -5237,15 +6323,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
- $ECHO
+ echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
- $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"
- $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."
+ 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"
+ 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
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
@@ -5272,11 +6358,11 @@ func_mode_link ()
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
- newdlprefiles="$newdlprefiles $deplib"
+ func_append newdlprefiles " $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- newdlfiles="$newdlfiles $deplib"
+ func_append newdlfiles " $deplib"
fi
fi
continue
@@ -5318,20 +6404,20 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
esac
done
fi
- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ 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
- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ test -n "$dlopen" && func_append dlfiles " $dlopen"
+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
if test "$pass" = conv; then
@@ -5342,20 +6428,20 @@ func_mode_link ()
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 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"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- if $opt_duplicate_deps ; then
+ if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- tmp_libs="$tmp_libs $deplib"
+ func_append tmp_libs " $deplib"
done
continue
fi # $pass = conv
@@ -5363,9 +6449,15 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
- for l in $old_library $library_names; do
- linklib="$l"
- done
+ if test -n "$old_library" &&
+ { test "$prefer_static_libs" = yes ||
+ test "$prefer_static_libs,$installed" = "built,no"; }; then
+ linklib=$old_library
+ else
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
+ fi
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
@@ -5382,9 +6474,9 @@ func_mode_link ()
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
- dlprefiles="$dlprefiles $lib $dependency_libs"
+ func_append dlprefiles " $lib $dependency_libs"
else
- newdlfiles="$newdlfiles $lib"
+ func_append newdlfiles " $lib"
fi
continue
fi # $pass = dlopen
@@ -5406,14 +6498,14 @@ func_mode_link ()
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; 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"
else
- dir="$libdir"
- absdir="$libdir"
+ dir="$lt_sysroot$libdir"
+ absdir="$lt_sysroot$libdir"
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
@@ -5421,12 +6513,12 @@ func_mode_link ()
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ func_append notinst_path " $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ func_append notinst_path " $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
@@ -5437,20 +6529,46 @@ func_mode_link ()
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
- # Prefer using a static library (so that no silly _DYNAMIC symbols
- # are required to link).
- if test -n "$old_library"; then
- newdlprefiles="$newdlprefiles $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
- # Otherwise, use the dlname, so that lt_dlopen finds it.
- elif test -n "$dlname"; then
- newdlprefiles="$newdlprefiles $dir/$dlname"
- else
- newdlprefiles="$newdlprefiles $dir/$linklib"
- fi
+ case "$host" in
+ # special handling for platforms with PE-DLLs.
+ *cygwin* | *mingw* | *cegcc* )
+ # Linker will automatically link against shared library if both
+ # static and shared are present. Therefore, ensure we extract
+ # symbols from the import library if a shared library is present
+ # (otherwise, the dlopen module name will be incorrect). We do
+ # this by putting the import library name into $newdlprefiles.
+ # We recover the dlopen module name by 'saving' the la file
+ # name in a special purpose variable, and (later) extracting the
+ # dlname from the la file.
+ if test -n "$dlname"; then
+ func_tr_sh "$dir/$linklib"
+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+ func_append newdlprefiles " $dir/$linklib"
+ else
+ func_append newdlprefiles " $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ func_append dlpreconveniencelibs " $dir/$old_library"
+ fi
+ ;;
+ * )
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ func_append newdlprefiles " $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ func_append dlpreconveniencelibs " $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ func_append newdlprefiles " $dir/$dlname"
+ else
+ func_append newdlprefiles " $dir/$linklib"
+ fi
+ ;;
+ esac
fi # $pass = dlpreopen
if test -z "$libdir"; then
@@ -5468,7 +6586,7 @@ func_mode_link ()
if test "$linkmode" = prog && test "$pass" != link; then
- newlib_search_path="$newlib_search_path $ladir"
+ func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
@@ -5481,7 +6599,8 @@ func_mode_link ()
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
esac
# Need to link against all dependency_libs?
@@ -5492,12 +6611,12 @@ func_mode_link ()
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_duplicate_deps ; then
+ if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- tmp_libs="$tmp_libs $deplib"
+ func_append tmp_libs " $deplib"
done # for deplib
continue
fi # $linkmode = prog...
@@ -5512,7 +6631,7 @@ func_mode_link ()
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
- *) temp_rpath="$temp_rpath$absdir:" ;;
+ *) func_append temp_rpath "$absdir:" ;;
esac
fi
@@ -5524,7 +6643,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
@@ -5533,7 +6652,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
+ *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
@@ -5558,12 +6677,12 @@ func_mode_link ()
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
- notinst_deplibs="$notinst_deplibs $lib"
+ func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
+ func_append notinst_deplibs " $lib"
need_relink=yes
fi
;;
@@ -5580,7 +6699,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
- $ECHO
+ echo
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
@@ -5598,7 +6717,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
@@ -5607,7 +6726,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
+ *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
@@ -5661,7 +6780,7 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$mode" != relink; then
+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
add_shlibpath=
add_dir=
add=
@@ -5683,9 +6802,9 @@ func_mode_link ()
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
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"
+ 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"
fi
@@ -5717,7 +6836,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -5739,7 +6858,7 @@ func_mode_link ()
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
@@ -5753,13 +6872,13 @@ func_mode_link ()
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
esac
fi
fi
fi
- if test "$linkmode" = prog || test "$mode" = relink; then
+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
add_shlibpath=
add_dir=
add=
@@ -5773,7 +6892,7 @@ func_mode_link ()
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -5790,7 +6909,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -5825,21 +6944,21 @@ func_mode_link ()
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- $ECHO
+ echo
$ECHO "*** Warning: This system can not 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."
+ 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
- $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."
+ 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 "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ 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 "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
@@ -5867,37 +6986,46 @@ func_mode_link ()
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
- *) xrpath="$xrpath $temp_xrpath";;
+ *) func_append xrpath " $temp_xrpath";;
esac;;
- *) temp_deplibs="$temp_deplibs $libdir";;
+ *) func_append temp_deplibs " $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
- newlib_search_path="$newlib_search_path $absdir"
+ func_append newlib_search_path " $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
- if $opt_duplicate_deps ; then
+ case $deplib in
+ -L*) func_stripname '-L' '' "$deplib"
+ func_resolve_sysroot "$func_stripname_result";;
+ *) func_resolve_sysroot "$deplib" ;;
+ esac
+ if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $func_resolve_sysroot_result "*)
+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
esac
fi
- tmp_libs="$tmp_libs $deplib"
+ func_append tmp_libs " $func_resolve_sysroot_result"
done
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
+ path=
case $deplib in
-L*) path="$deplib" ;;
*.la)
+ func_resolve_sysroot "$deplib"
+ deplib=$func_resolve_sysroot_result
func_dirname "$deplib" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -5924,8 +7052,8 @@ func_mode_link ()
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- linker_flags="$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
@@ -5958,7 +7086,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@ -5975,7 +7103,7 @@ func_mode_link ()
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
- *) lib_search_path="$lib_search_path $dir" ;;
+ *) func_append lib_search_path " $dir" ;;
esac
done
newlib_search_path=
@@ -6033,10 +7161,10 @@ func_mode_link ()
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
- *) tmp_libs="$tmp_libs $deplib" ;;
+ *) func_append tmp_libs " $deplib" ;;
esac
;;
- *) tmp_libs="$tmp_libs $deplib" ;;
+ *) func_append tmp_libs " $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
@@ -6052,7 +7180,7 @@ func_mode_link ()
;;
esac
if test -n "$i" ; then
- tmp_libs="$tmp_libs $i"
+ func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
@@ -6093,7 +7221,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
- objs="$objs$old_deplibs"
+ func_append objs "$old_deplibs"
;;
lib)
@@ -6126,10 +7254,10 @@ func_mode_link ()
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
- libobjs="$libobjs $objs"
+ func_append libobjs " $objs"
fi
fi
@@ -6194,7 +7322,7 @@ func_mode_link ()
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|sunos)
+ freebsd-aout|freebsd-elf|qnx|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@ -6327,7 +7455,7 @@ func_mode_link ()
done
# Make executables depend on our current version.
- verstring="$verstring:${current}.0"
+ func_append verstring ":${current}.0"
;;
qnx)
@@ -6395,10 +7523,10 @@ func_mode_link ()
fi
func_generate_dlsyms "$libname" "$libname" "yes"
- libobjs="$libobjs $symfileobj"
+ func_append libobjs " $symfileobj"
test "X$libobjs" = "X " && libobjs=
- if test "$mode" != relink; then
+ if test "$opt_mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -6414,7 +7542,7 @@ func_mode_link ()
continue
fi
fi
- removelist="$removelist $p"
+ func_append removelist " $p"
;;
*) ;;
esac
@@ -6425,27 +7553,28 @@ func_mode_link ()
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
- temp_xrpath="$temp_xrpath -R$libdir"
+ func_replace_sysroot "$libdir"
+ func_append temp_xrpath " -R$func_replace_sysroot_result"
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -6459,7 +7588,7 @@ func_mode_link ()
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
- *) dlfiles="$dlfiles $lib" ;;
+ *) func_append dlfiles " $lib" ;;
esac
done
@@ -6469,19 +7598,19 @@ func_mode_link ()
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
- *) dlprefiles="$dlprefiles $lib" ;;
+ *) func_append dlprefiles " $lib" ;;
esac
done
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- deplibs="$deplibs System.ltframework"
+ func_append deplibs " System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
@@ -6498,7 +7627,7 @@ func_mode_link ()
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
- deplibs="$deplibs -lc"
+ func_append deplibs " -lc"
fi
;;
esac
@@ -6547,7 +7676,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
i=""
;;
esac
@@ -6558,21 +7687,21 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $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 I believe you do not have"
- $ECHO "*** because a test_compile did reveal that the linker did not use it for"
- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+ 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 I believe you do not have"
+ echo "*** because a test_compile did reveal that the linker did not use it for"
+ echo "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
;;
esac
done
@@ -6590,7 +7719,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
i=""
;;
esac
@@ -6601,29 +7730,29 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $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"
- $ECHO "*** because a test_compile did reveal that the linker did not use this one"
- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+ 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"
+ echo "*** because a test_compile did reveal that the linker did not use this one"
+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
- $ECHO "*** make it link in! You will probably need to install it or some"
- $ECHO "*** library that it depends on before this library will be fully"
- $ECHO "*** functional. Installing it before continuing would be even better."
+ echo "*** make it link in! You will probably need to install it or some"
+ echo "*** library that it depends on before this library will be fully"
+ echo "*** functional. Installing it before continuing would be even better."
fi
;;
*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
;;
esac
done
@@ -6640,15 +7769,27 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
fi
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`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ if test "$want_nocaseglob" = yes; then
+ shopt -s nocaseglob
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+ $nocaseglob
+ else
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+ fi
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
@@ -6665,13 +7806,13 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$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
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
@@ -6680,12 +7821,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $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"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ 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"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
@@ -6696,7 +7837,7 @@ EOF
;;
*)
# Add a -L argument.
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
@@ -6712,7 +7853,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
@@ -6723,9 +7864,9 @@ EOF
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
- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
@@ -6734,12 +7875,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $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"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ 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"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
@@ -6750,32 +7891,32 @@ EOF
;;
*)
# Add a -L argument.
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+ 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
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
done
fi
- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
- $GREP . >/dev/null; then
- $ECHO
+ case $tmp_deplibs in
+ *[!\ \ ]*)
+ echo
if test "X$deplibs_check_method" = "Xnone"; then
- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
else
- $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+ echo "*** Warning: inter-library dependencies are not known to be supported."
fi
- $ECHO "*** All declared inter-library dependencies are being dropped."
+ echo "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
- fi
+ ;;
+ esac
;;
esac
versuffix=$versuffix_save
@@ -6787,23 +7928,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
- $ECHO
- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
- $ECHO "*** a static module, that should work as long as the dlopening"
- $ECHO "*** application is linked with the -dlopen flag."
+ echo "*** a static module, that should work as long as the dlopening"
+ echo "*** application is linked with the -dlopen flag."
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 "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ 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 "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
@@ -6813,16 +7954,16 @@ EOF
build_libtool_libs=no
fi
else
- $ECHO "*** The inter-library dependencies that have been dropped here will be"
- $ECHO "*** automatically added whenever a program is linked with this library"
- $ECHO "*** or is declared to -dlopen it."
+ echo "*** The inter-library dependencies that have been dropped here will be"
+ echo "*** automatically added whenever a program is linked with this library"
+ echo "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; 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."
+ 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"
build_libtool_libs=module
@@ -6839,9 +7980,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -6854,7 +7995,7 @@ EOF
*)
case " $deplibs " in
*" -L$path/$objdir "*)
- new_libs="$new_libs -L$path/$objdir" ;;
+ func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
@@ -6864,10 +8005,10 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
done
deplibs="$new_libs"
@@ -6884,10 +8025,12 @@ EOF
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
- test "$mode" != relink && rpath="$compile_rpath$rpath"
+ test "$opt_mode" != relink && 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"
else
@@ -6896,18 +8039,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- dep_rpath="$dep_rpath $flag"
+ func_append dep_rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
+ *) func_apped perm_rpath " $libdir" ;;
esac
fi
done
@@ -6925,7 +8068,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
@@ -6933,7 +8076,7 @@ EOF
fi
shlibpath="$finalize_shlibpath"
- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -6959,18 +8102,18 @@ EOF
linknames=
for link
do
- linknames="$linknames $link"
+ func_append linknames " $link"
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
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"
- delfiles="$delfiles $export_symbols"
+ func_append delfiles " $export_symbols"
fi
orig_export_symbols=
@@ -7001,13 +8144,45 @@ EOF
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
+ for cmd1 in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
- func_len " $cmd"
- len=$func_len_result
- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ # 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
+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+ try_normal_branch=yes
+ eval cmd=\"$cmd1\"
+ func_len " $cmd"
+ len=$func_len_result
+ ;;
+ *)
+ try_normal_branch=no
+ ;;
+ esac
+ if test "$try_normal_branch" = yes \
+ && { test "$len" -lt "$max_cmd_len" \
+ || test "$max_cmd_len" -le -1; }
+ then
+ func_show_eval "$cmd" 'exit $?'
+ skipped_export=false
+ elif test -n "$nm_file_list_spec"; then
+ func_basename "$output"
+ output_la=$func_basename_result
+ save_libobjs=$libobjs
+ save_output=$output
+ 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"
+ func_verbose "creating $NM input file list: $output"
+ for obj in $save_libobjs; do
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result"
+ done > "$output"
+ eval cmd=\"$cmd1\"
func_show_eval "$cmd" 'exit $?'
+ output=$save_output
+ libobjs=$save_libobjs
skipped_export=false
else
# The command line is too long to execute in one step.
@@ -7029,7 +8204,7 @@ EOF
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"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_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
@@ -7041,7 +8216,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -7051,7 +8226,7 @@ EOF
case " $convenience " in
*" $test_deplib "*) ;;
*)
- tmp_deplibs="$tmp_deplibs $test_deplib"
+ func_append tmp_deplibs " $test_deplib"
;;
esac
done
@@ -7071,21 +8246,21 @@ EOF
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $convenience
- libobjs="$libobjs $func_extract_archives_result"
+ func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
- linker_flags="$linker_flags $flag"
+ func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
@@ -7130,7 +8305,8 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+ func_basename "$output"
+ output_la=$func_basename_result
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -7143,13 +8319,16 @@ EOF
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
- $ECHO 'INPUT (' > $output
+ echo 'INPUT (' > $output
for obj in $save_libobjs
do
- $ECHO "$obj" >> $output
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result" >> $output
done
- $ECHO ')' >> $output
- delfiles="$delfiles $output"
+ echo ')' >> $output
+ 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
func_verbose "creating linker input file list: $output"
@@ -7163,10 +8342,12 @@ EOF
fi
for obj
do
- $ECHO "$obj" >> $output
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result" >> $output
done
- delfiles="$delfiles $output"
- output=$firstobj\"$file_list_spec$output\"
+ func_append delfiles " $output"
+ func_to_tool_file "$output"
+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
@@ -7190,17 +8371,19 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ reload_objs=$objlist
+ eval concat_cmds=\"$reload_cmds\"
else
# All subsequent reloadable object files will link in
# the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
- objlist=$obj
+ objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
@@ -7210,11 +8393,12 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
- delfiles="$delfiles $output"
+ func_append delfiles " $output"
else
output=
@@ -7248,7 +8432,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -7269,7 +8453,7 @@ EOF
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"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@ -7281,7 +8465,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -7322,10 +8506,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
- libobjs="$libobjs $func_extract_archives_result"
+ func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
@@ -7341,7 +8525,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -7353,7 +8537,7 @@ EOF
IFS="$save_ifs"
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; 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
@@ -7434,18 +8618,21 @@ EOF
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 "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
+ # If we're not building shared, we need to use non_pic_objs
+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$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" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7505,8 +8692,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
@@ -7517,14 +8704,14 @@ EOF
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- compile_command="$compile_command ${wl}-bind_at_load"
- finalize_command="$finalize_command ${wl}-bind_at_load"
+ func_append compile_command " ${wl}-bind_at_load"
+ func_append finalize_command " ${wl}-bind_at_load"
;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -7538,7 +8725,7 @@ EOF
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
- new_libs="$new_libs -L$path/$objdir" ;;
+ func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
@@ -7548,17 +8735,17 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
done
compile_deplibs="$new_libs"
- compile_command="$compile_command $compile_deplibs"
- finalize_command="$finalize_command $finalize_deplibs"
+ func_append compile_command " $compile_deplibs"
+ func_append finalize_command " $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -7566,7 +8753,7 @@ EOF
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
done
fi
@@ -7585,18 +8772,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- rpath="$rpath $flag"
+ func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
case $host in
@@ -7605,12 +8792,12 @@ EOF
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
- *) dllsearchpath="$dllsearchpath:$libdir";;
+ *) func_append dllsearchpath ":$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
+ *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
@@ -7636,18 +8823,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- rpath="$rpath $flag"
+ func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ *) func_append finalize_perm_rpath " $libdir" ;;
esac
fi
done
@@ -7661,8 +8848,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 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"
@@ -7674,15 +8861,15 @@ EOF
wrappers_required=yes
case $host in
+ *cegcc* | *mingw32ce*)
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
- *cegcc)
- # Disable wrappers for cegcc, we are cross compiling anyway.
- wrappers_required=no
- ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
@@ -7691,13 +8878,19 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -7720,7 +8913,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -7728,7 +8921,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -7738,11 +8931,18 @@ EOF
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
+
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
exit $EXIT_SUCCESS
fi
@@ -7757,7 +8957,7 @@ EOF
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -7769,13 +8969,19 @@ EOF
fi
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
func_show_eval "$link_command" 'exit $?'
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output_objdir/$outputname"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Now create the wrapper script.
func_verbose "creating $output"
@@ -7793,18 +8999,7 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- fi
-
- # Quote $ECHO for shipping.
- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
- case $progpath in
- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- esac
- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
- else
- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -7884,7 +9079,7 @@ EOF
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
- oldobjs="$oldobjs $symfileobj"
+ func_append oldobjs " $symfileobj"
fi
fi
addlibs="$old_convenience"
@@ -7892,10 +9087,10 @@ EOF
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $addlibs
- oldobjs="$oldobjs $func_extract_archives_result"
+ func_append oldobjs " $func_extract_archives_result"
fi
# Do each command in the archive commands.
@@ -7906,10 +9101,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
- oldobjs="$oldobjs $func_extract_archives_result"
+ func_append oldobjs " $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
@@ -7925,9 +9120,9 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
- $ECHO "copying selected object files to avoid basename conflicts..."
+ echo "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
@@ -7951,9 +9146,9 @@ EOF
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- oldobjs="$oldobjs $gentop/$newobj"
+ func_append oldobjs " $gentop/$newobj"
;;
- *) oldobjs="$oldobjs $obj" ;;
+ *) func_append oldobjs " $obj" ;;
esac
done
fi
@@ -7963,6 +9158,16 @@ EOF
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
+ elif test -n "$archiver_list_spec"; then
+ func_verbose "using command file archive linking..."
+ for obj in $oldobjs
+ do
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result"
+ done > $output_objdir/$libname.libcmd
+ func_to_tool_file "$output_objdir/$libname.libcmd"
+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+ cmds=$old_archive_cmds
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
@@ -8036,7 +9241,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -8059,9 +9264,19 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- newdependency_libs="$newdependency_libs $libdir/$name"
+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ -L*)
+ func_stripname -L '' "$deplib"
+ func_replace_sysroot "$func_stripname_result"
+ func_append newdependency_libs " -L$func_replace_sysroot_result"
;;
- *) newdependency_libs="$newdependency_libs $deplib" ;;
+ -R*)
+ func_stripname -R '' "$deplib"
+ func_replace_sysroot "$func_stripname_result"
+ func_append newdependency_libs " -R$func_replace_sysroot_result"
+ ;;
+ *) func_append newdependency_libs " $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
@@ -8075,9 +9290,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- newdlfiles="$newdlfiles $libdir/$name"
+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
- *) newdlfiles="$newdlfiles $lib" ;;
+ *) func_append newdlfiles " $lib" ;;
esac
done
dlfiles="$newdlfiles"
@@ -8094,7 +9309,7 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- newdlprefiles="$newdlprefiles $libdir/$name"
+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
@@ -8106,7 +9321,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- newdlfiles="$newdlfiles $abs"
+ func_append newdlfiles " $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
@@ -8115,15 +9330,33 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- newdlprefiles="$newdlprefiles $abs"
+ func_append newdlprefiles " $abs"
done
dlprefiles="$newdlprefiles"
fi
$RM $output
# place dlname in correct position for cygwin
+ # In fact, it would be nice if we could use this code for all target
+ # systems that can't hard-code library paths into their executables
+ # and that have no shared library path variable independent of PATH,
+ # but it turns out we can't easily determine that from inspecting
+ # libtool variables, so we have to hard-code the OSs to which it
+ # applies here; at the moment, that means platforms that use the PE
+ # object format with DLL files. See the long comment at the top of
+ # tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ *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
+ func_relative_path "$install_libdir" "$bindir"
+ tdlname=$func_relative_path_result$dlname
+ else
+ # Otherwise fall back on heuristic.
+ tdlname=../bin/$dlname
+ fi
+ ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
@@ -8182,7 +9415,7 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
func_mode_link ${1+"$@"}
@@ -8202,9 +9435,9 @@ func_mode_uninstall ()
for arg
do
case $arg in
- -f) RM="$RM $arg"; rmforce=yes ;;
- -*) RM="$RM $arg" ;;
- *) files="$files $arg" ;;
+ -f) func_append RM " $arg"; rmforce=yes ;;
+ -*) func_append RM " $arg" ;;
+ *) func_append files " $arg" ;;
esac
done
@@ -8213,24 +9446,23 @@ func_mode_uninstall ()
rmdirs=
- origobjdir="$objdir"
for file in $files; do
func_dirname "$file" "" "."
dir="$func_dirname_result"
if test "X$dir" = X.; then
- objdir="$origobjdir"
+ odir="$objdir"
else
- objdir="$dir/$origobjdir"
+ odir="$dir/$objdir"
fi
func_basename "$file"
name="$func_basename_result"
- test "$mode" = uninstall && objdir="$dir"
+ test "$opt_mode" = uninstall && odir="$dir"
- # Remember objdir for removal later, being careful to avoid duplicates
- if test "$mode" = clean; then
+ # Remember odir for removal later, being careful to avoid duplicates
+ if test "$opt_mode" = clean; then
case " $rmdirs " in
- *" $objdir "*) ;;
- *) rmdirs="$rmdirs $objdir" ;;
+ *" $odir "*) ;;
+ *) func_append rmdirs " $odir" ;;
esac
fi
@@ -8256,18 +9488,17 @@ func_mode_uninstall ()
# Delete the libtool libraries and symlinks.
for n in $library_names; do
- rmfiles="$rmfiles $objdir/$n"
+ func_append rmfiles " $odir/$n"
done
- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$mode" in
+ case "$opt_mode" in
clean)
- case " $library_names " in
- # " " in the beginning catches empty $dlname
+ case " $library_names " in
*" $dlname "*) ;;
- *) rmfiles="$rmfiles $objdir/$dlname" ;;
+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
esac
- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
@@ -8295,19 +9526,19 @@ func_mode_uninstall ()
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
- rmfiles="$rmfiles $dir/$pic_object"
+ 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
- rmfiles="$rmfiles $dir/$non_pic_object"
+ func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$mode" = clean ; then
+ if test "$opt_mode" = clean ; then
noexename=$name
case $file in
*.exe)
@@ -8317,7 +9548,7 @@ func_mode_uninstall ()
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
- rmfiles="$rmfiles $file"
+ func_append rmfiles " $file"
;;
esac
# Do a test to see if this is a libtool program.
@@ -8326,7 +9557,7 @@ func_mode_uninstall ()
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+ func_append rmfiles " $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
@@ -8334,12 +9565,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
- rmfiles="$rmfiles $objdir/lt-$name"
+ func_append rmfiles " $odir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+ func_append rmfiles " $odir/lt-${noexename}.c"
fi
fi
fi
@@ -8347,7 +9578,6 @@ func_mode_uninstall ()
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
@@ -8359,16 +9589,16 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
func_mode_uninstall ${1+"$@"}
-test -z "$mode" && {
+test -z "$opt_mode" && {
help="$generic_help"
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$mode'"
+ func_fatal_help "invalid operation mode \`$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
diff --git a/conf/ltoptions.m4 b/conf/ltoptions.m4
index 34151a3..17cfd51 100644
--- a/conf/ltoptions.m4
+++ b/conf/ltoptions.m4
@@ -1,13 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2008, 2009 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 6 ltoptions.m4
+# serial 7 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -133,13 +134,13 @@ case $host in
esac
test -z "$AS" && AS=as
-_LT_DECL([], [AS], [0], [Assembler program])dnl
+_LT_DECL([], [AS], [1], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
diff --git a/conf/ltversion.m4 b/conf/ltversion.m4
index f3c5309..9c7b5d4 100644
--- a/conf/ltversion.m4
+++ b/conf/ltversion.m4
@@ -7,17 +7,17 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# Generated from ltversion.in.
+# @configure_input@
-# serial 3017 ltversion.m4
+# serial 3293 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.4])
+m4_define([LT_PACKAGE_REVISION], [1.3293])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.4'
+macro_revision='1.3293'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/conf/lt~obsolete.m4 b/conf/lt~obsolete.m4
index 637bb20..c573da9 100644
--- a/conf/lt~obsolete.m4
+++ b/conf/lt~obsolete.m4
@@ -1,13 +1,13 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Written by Scott James Remnant, 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 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/conf/missing b/conf/missing
index 28055d2..cdea514 100755
--- a/conf/missing
+++ b/conf/missing
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# 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
@@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake at gnu.org>."
exit $?
@@ -100,272 +70,141 @@ Send bug reports to <bug-automake at gnu.org>."
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/conf/test-driver b/conf/test-driver
new file mode 100755
index 0000000..32bf39e
--- /dev/null
+++ b/conf/test-driver
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, 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 <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+# Make unconditional expansion of undefined variables an error. This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+ echo "$0: $*" >&2
+ print_usage >&2
+ exit 2
+}
+
+print_usage ()
+{
+ cat <<END
+Usage:
+ test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+ [--expect-failure={yes|no}] [--color-tests={yes|no}]
+ [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file= # Where to save the output of the test script.
+trs_file= # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+ case $1 in
+ --help) print_usage; exit $?;;
+ --version) echo "test-driver $scriptversion"; exit $?;;
+ --test-name) test_name=$2; shift;;
+ --log-file) log_file=$2; shift;;
+ --trs-file) trs_file=$2; shift;;
+ --color-tests) color_tests=$2; shift;;
+ --expect-failure) expect_failure=$2; shift;;
+ --enable-hard-errors) enable_hard_errors=$2; shift;;
+ --) shift; break;;
+ -*) usage_error "invalid option: '$1'";;
+ esac
+ shift
+done
+
+if test $color_tests = yes; then
+ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+ red='[0;31m' # Red.
+ grn='[0;32m' # Green.
+ lgn='[1;32m' # Light green.
+ blu='[1;34m' # Blue.
+ mgn='[0;35m' # Magenta.
+ std='[m' # No color.
+else
+ red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+ estatus=1
+fi
+
+case $estatus:$expect_failure in
+ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+ 0:*) col=$grn res=PASS recheck=no gcopy=no;;
+ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
+ 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
+ *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
+ *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.h.in b/config.h.in
index 97f8b9b..2f91366 100644
--- a/config.h.in
+++ b/config.h.in
@@ -27,15 +27,15 @@
/* Should a function (run-time) be used to determine the byte order? */
#undef COMPUTE_ENDIAN_AT_RUNTIME
-/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
- systems. This function is required for 'alloca.c' support on those systems.
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+ systems. This function is required for `alloca.c' support on those systems.
*/
#undef CRAY_STACKSEG_END
/* Client version number */
#undef CVER
-/* Define to 1 if using 'alloca.c'. */
+/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
/* Should DAP4 support be enabled? */
@@ -665,10 +665,10 @@
/* Define to 1 if you have the `strtoul' function. */
#undef HAVE_STRTOUL
-/* Define to 1 if `decimal_point' is member of `struct lconv'. */
+/* Define to 1 if `decimal_point' is a member of `struct lconv'. */
#undef HAVE_STRUCT_LCONV_DECIMAL_POINT
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the `symlink' function. */
@@ -777,9 +777,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
@@ -795,6 +792,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -849,9 +849,9 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at runtime.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
diff --git a/configure b/configure
index c5dcd66..0c26858 100755
--- a/configure
+++ b/configure
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for libdap 3.18.3.
+# Generated by GNU Autoconf 2.69 for libdap 3.19.0.
#
# Report bugs to <opendap-tech at opendap.org>.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -46,7 +40,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -57,7 +57,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -96,15 +89,16 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -116,12 +110,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -133,7 +131,302 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # 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
+fi
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
+
+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
+else
+ as_have_required=no
+fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ as_found=:
+ case $as_dir in #(
+ /*)
+ for as_base in sh bash ksh sh5; do
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
+ done;;
+ esac
+ as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and
+$0: opendap-tech at opendap.org about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
+ fi
+ exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -147,8 +440,12 @@ else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
@@ -168,558 +465,106 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
-if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
-else
- as_have_required=no
-fi
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
}
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
+esac
-if as_func_ret_success; then
- :
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
+ fi
else
- exitcode=1
- echo positional parameters were not saved.
+ as_ln_s='cp -pR'
fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
-else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- case $as_dir in
- /*)
- for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
- done;;
- esac
-done
-IFS=$as_save_IFS
-
-
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p='mkdir -p "$as_dir"'
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
fi
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf at gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
- case `echo 'x\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-$*
-_LT_EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+SHELL=${CONFIG_SHELL-/bin/sh}
as_awk_strverscmp='
# Use only awk features that work with 7th edition Unix awk (1978).
@@ -782,10 +627,11 @@ as_awk_strverscmp='
}
'
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -800,14 +646,14 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libdap'
PACKAGE_TARNAME='libdap'
-PACKAGE_VERSION='3.18.3'
-PACKAGE_STRING='libdap 3.18.3'
+PACKAGE_VERSION='3.19.0'
+PACKAGE_STRING='libdap 3.19.0'
PACKAGE_BUGREPORT='opendap-tech at opendap.org'
+PACKAGE_URL=''
ac_unique_file="Connect.cc"
# Factoring default headers for most tests.
@@ -1302,7 +1148,9 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
+ac_ct_AR
+DLLTOOL
OBJDUMP
NM
ac_ct_DUMPBIN
@@ -1332,6 +1180,7 @@ CC
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
CXXDEPMODE
+am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -1369,6 +1218,10 @@ PACKAGE_SUBMINOR_VERSION
PACKAGE_MINOR_VERSION
PACKAGE_MAJOR_VERSION
DVR
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
am__untar
am__tar
AMTAR
@@ -1423,6 +1276,7 @@ bindir
program_transform_name
prefix
exec_prefix
+PACKAGE_URL
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
@@ -1433,6 +1287,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_silent_rules
enable_dependency_tracking
enable_threads
enable_shared
@@ -1440,6 +1295,7 @@ enable_static
with_pic
enable_fast_install
with_gnu_ld
+with_sysroot
enable_libtool_lock
enable_runtime_endian_check
enable_rpath
@@ -1537,8 +1393,9 @@ do
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1583,8 +1440,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1610,8 +1466,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1815,8 +1670,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1832,8 +1686,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1863,17 +1716,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1882,7 +1735,7 @@ Try \`$0 --help' for more information." >&2
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -1890,15 +1743,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1921,8 +1772,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1936,8 +1786,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1952,11 +1800,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1995,13 +1841,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2027,7 +1871,7 @@ if test "$ac_init_help" = "long"; then
# 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.18.3 to adapt to many kinds of systems.
+\`configure' configures libdap 3.19.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2041,7 +1885,7 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -2097,7 +1941,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libdap 3.18.3:";;
+ short | recursive ) echo "Configuration of libdap 3.19.0:";;
esac
cat <<\_ACEOF
@@ -2105,8 +1949,12 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-threads={posix|solaris|pth|windows}
specify multithreading API
--disable-threads build without multithread safety
@@ -2134,6 +1982,8 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--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-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
@@ -2152,7 +2002,7 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CC C compiler command
CFLAGS C compiler flags
@@ -2234,857 +2084,1648 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libdap configure 3.18.3
-generated by GNU Autoconf 2.63
+libdap configure 3.19.0
+generated by GNU Autoconf 2.69
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
exit
fi
-cat >config.log <<_ACEOF
-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.18.3, which was
-generated by GNU Autoconf 2.63. Invocation command line was
- $ $0 $@
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
-_ACEOF
-exec 5>>config.log
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+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_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+} # ac_fn_cxx_try_compile
-_ASUNAME
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+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_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-} >&5
+} # ac_fn_c_try_compile
-cat >&5 <<_ACEOF
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-## ----------- ##
-## Core tests. ##
-## ----------- ##
+} # ac_fn_c_try_cpp
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
- 2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
- if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
- else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
- fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- sed -n \
- "s/'\''/'\''\\\\'\'''\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
- ;; #(
- *)
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-)
- echo
-
- cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
- echo
- for ac_var in $ac_subst_files
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
+} # ac_fn_c_check_header_mongrel
- if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
- echo
- cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+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_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { 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_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-# Predefined preprocessor variables.
+} # ac_fn_c_try_run
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+} # ac_fn_c_check_header_compile
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+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_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+} # ac_fn_c_try_link
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+#undef $2
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
+ eval "$3=no"
fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
- test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
- fi
-done
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_list="$ac_header_list fcntl.h"
-ac_header_list="$ac_header_list malloc.h"
-ac_header_list="$ac_header_list memory.h"
-ac_header_list="$ac_header_list stddef.h"
-ac_header_list="$ac_header_list stdlib.h"
-ac_header_list="$ac_header_list string.h"
-ac_header_list="$ac_header_list strings.h"
-ac_header_list="$ac_header_list unistd.h"
-ac_header_list="$ac_header_list pthread.h"
-ac_header_list="$ac_header_list sys/param.h"
-ac_header_list="$ac_header_list sys/time.h"
-ac_header_list="$ac_header_list netinet/in.h"
-ac_func_list="$ac_func_list btowc"
-ac_header_list="$ac_header_list langinfo.h"
-ac_func_list="$ac_func_list symlink"
-ac_header_list="$ac_header_list xlocale.h"
-ac_func_list="$ac_func_list mbsinit"
-ac_func_list="$ac_func_list mbrtowc"
-ac_func_list="$ac_func_list nl_langinfo"
-ac_func_list="$ac_func_list isblank"
-ac_func_list="$ac_func_list iswctype"
-ac_header_list="$ac_header_list wchar.h"
-ac_header_list="$ac_header_list stdint.h"
-ac_header_list="$ac_header_list features.h"
-ac_func_list="$ac_func_list wcrtomb"
-ac_func_list="$ac_func_list iswcntrl"
-ac_header_list="$ac_header_list wctype.h"
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
- # differences in whitespace do not lead to failure.
- ac_old_val_w=`echo x $ac_old_val`
- ac_new_val_w=`echo x $ac_new_val`
- if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- ac_cache_corrupted=:
- else
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
- eval $ac_var=\$ac_old_val
- fi
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ ac_retval=1
fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+} # ac_fn_cxx_try_cpp
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+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_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+} # ac_fn_cxx_try_link
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+} # ac_fn_c_check_type
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+} # ac_fn_c_check_member
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0;
+return test_array [0];
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=$ac_mid; break
+else
+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0;
+return test_array [0];
-
-
-
-
-
-
-
-
-
-
-
-
-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
-
-
-
-cat >>confdefs.h <<\_ACEOF
-#define DAP_PROTOCOL_VERSION "4.0"
+ ;
+ return 0;
+}
_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_lo=$ac_mid; break
+else
+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=$ac_mid
+else
+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (($2) < 0)
+ {
+ long int i = longval ();
+ if (i != ($2))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ($2))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+ ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
-ac_aux_dir=
-for ac_dir in conf "$srcdir"/conf; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
fi
-done
-if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in conf \"$srcdir\"/conf" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in conf \"$srcdir\"/conf" >&2;}
- { (exit 1); exit 1; }; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+} # ac_fn_c_check_decl
+cat >config.log <<_ACEOF
+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.19.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
-ac_config_headers="$ac_config_headers config.h dods-datatypes-config.h xdr-datatypes-config.h"
+ $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-am__api_version='1.11'
+_ASUNAME
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- fi
- done
- done
- ;;
-esac
-
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+} >&5
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+cat >&5 <<_ACEOF
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+## ----------- ##
+## Core tests. ##
+## ----------- ##
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name. Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
- *[\\\"\#\$\&\'\`$am_lf]*)
- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-case $srcdir in
- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
- { (exit 1); exit 1; }; };;
-esac
+_ACEOF
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+ for ac_arg
+ do
+ case $ac_arg in
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+ *\'*)
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+ 2)
+ as_fn_append ac_configure_args1 " '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+ ac_must_keep_next=false # Got value, back to normal.
+ else
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+ as_fn_append ac_configure_args " '$ac_arg'"
+ ;;
+ esac
+ done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log. We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+ echo
-if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
+ $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
+ (set) 2>&1 |
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ sed -n \
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
+ *)
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+)
+ echo
-if test x"${install_sh}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
- esac
-fi
+ $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-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_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
+ if test -n "$ac_subst_files"; then
+ $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
+ done | sort
+ echo
+ fi
+
+ if test -s confdefs.h; then
+ $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
+ } >&5
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
-IFS=$as_save_IFS
+ac_signal=0
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
+elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+ test "x$ac_site_file" = xNONE && continue
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
-done
-IFS=$as_save_IFS
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+if test -r "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
+ esac
+ fi
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
fi
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
+as_fn_append ac_header_list " fcntl.h"
+as_fn_append ac_header_list " malloc.h"
+as_fn_append ac_header_list " memory.h"
+as_fn_append ac_header_list " stddef.h"
+as_fn_append ac_header_list " stdlib.h"
+as_fn_append ac_header_list " string.h"
+as_fn_append ac_header_list " strings.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " pthread.h"
+as_fn_append ac_header_list " sys/param.h"
+as_fn_append ac_header_list " sys/time.h"
+as_fn_append ac_header_list " netinet/in.h"
+as_fn_append ac_func_list " btowc"
+as_fn_append ac_header_list " langinfo.h"
+as_fn_append ac_func_list " symlink"
+as_fn_append ac_header_list " xlocale.h"
+as_fn_append ac_func_list " mbsinit"
+as_fn_append ac_func_list " mbrtowc"
+as_fn_append ac_func_list " nl_langinfo"
+as_fn_append ac_func_list " isblank"
+as_fn_append ac_func_list " iswctype"
+as_fn_append ac_header_list " wchar.h"
+as_fn_append ac_header_list " stdint.h"
+as_fn_append ac_header_list " features.h"
+as_fn_append ac_func_list " wcrtomb"
+as_fn_append ac_func_list " iswcntrl"
+as_fn_append ac_header_list " wctype.h"
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+ esac
fi
-else
- STRIP="$ac_cv_prog_STRIP"
+done
+if $ac_cache_corrupted; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+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 "#define DAP_PROTOCOL_VERSION \"4.0\"" >>confdefs.h
+
+
+
+ac_aux_dir=
+for ac_dir in conf "$srcdir"/conf; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in conf \"$srcdir\"/conf" "$LINENO" 5
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+
+ac_config_headers="$ac_config_headers config.h dods-datatypes-config.h xdr-datatypes-config.h"
+
+
+
+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
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
-done
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+
+ done
IFS=$as_save_IFS
-fi
+rm -rf conftest.one conftest.two conftest.dir
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
+ # value for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
+ INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
+ test "$2" = conftest.file
+ )
+then
+ # Ok.
+ :
else
-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_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
+ as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
fi
+rm -f conftest.file
- test -n "$AWK" && break
-done
+test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
+else
+ am_missing_run=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+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_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+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_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+ if ${ac_cv_path_mkdir+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+ done
+IFS=$as_save_IFS
+
+fi
+
+ test -d ./--version && rmdir ./--version
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ MKDIR_P="$ac_install_sh -d"
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+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_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AWK="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3094,11 +3735,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -3112,15 +3753,52 @@ else
fi
rmdir .tst 2>/dev/null
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -3136,7 +3814,7 @@ fi
# Define the identity of the package.
PACKAGE='libdap'
- VERSION='3.18.3'
+ VERSION='3.19.0'
cat >>confdefs.h <<_ACEOF
@@ -3164,26 +3842,75 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-ac_config_commands="$ac_config_commands tests/atconfig"
+# 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: <http://austingroupbugs.net/view.php?id=542>
-cat >>confdefs.h <<\_ACEOF
-#define CNAME "libdap"
-_ACEOF
+Please tell bug-automake at 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: <http://www.gnu.org/software/coreutils/>.
+
+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"
+
+
+
+$as_echo "#define CNAME \"libdap\"" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -3200,11 +3927,11 @@ _ACEOF
PACKAGE_MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's@^\([0-9]\)*\.\([0-9]*\)\.\([0-9]*\)$@\1@'`
PACKAGE_MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's@^\([0-9]\)*\.\([0-9]*\)\.\([0-9]*\)$@\2@'`
PACKAGE_SUBMINOR_VERSION=`echo $PACKAGE_VERSION | sed 's@^\([0-9]\)*\.\([0-9]*\)\.\([0-9]*\)$@\3@'`
-{ $as_echo "$as_me:$LINENO: Package Major Version: $PACKAGE_MAJOR_VERSION" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Package Major Version: $PACKAGE_MAJOR_VERSION" >&5
$as_echo "$as_me: Package Major Version: $PACKAGE_MAJOR_VERSION" >&6;}
-{ $as_echo "$as_me:$LINENO: Package Minor Version: $PACKAGE_MINOR_VERSION" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Package Minor Version: $PACKAGE_MINOR_VERSION" >&5
$as_echo "$as_me: Package Minor Version: $PACKAGE_MINOR_VERSION" >&6;}
-{ $as_echo "$as_me:$LINENO: Package SubMinor Version: $PACKAGE_SUBMINOR_VERSION" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Package SubMinor Version: $PACKAGE_SUBMINOR_VERSION" >&5
$as_echo "$as_me: Package SubMinor Version: $PACKAGE_SUBMINOR_VERSION" >&6;}
@@ -3213,35 +3940,27 @@ $as_echo "$as_me: Package SubMinor Version: $PACKAGE_SUBMINOR_VERSION" >&6;}
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -3257,28 +3976,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -3297,9 +4012,9 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-DAPLIB_CURRENT=24
-DAPLIB_AGE=1
-DAPLIB_REVISION=1
+DAPLIB_CURRENT=25
+DAPLIB_AGE=0
+DAPLIB_REVISION=0
@@ -3331,9 +4046,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if ${ac_cv_prog_AWK+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -3344,24 +4059,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
$as_echo "$AWK" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3383,9 +4098,9 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -3396,24 +4111,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
$as_echo "$CXX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3427,9 +4142,9 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -3440,24 +4155,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
$as_echo "$ac_ct_CXX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3470,7 +4185,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3481,48 +4196,31 @@ fi
fi
fi
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3538,8 +4236,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -3555,17 +4253,17 @@ do
done
rm -f $ac_rmfiles
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -3582,7 +4280,7 @@ do
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -3601,84 +4299,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
- $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+as_fn_error 77 "C++ compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
- fi
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3693,32 +4348,83 @@ for ac_file in conftest.exe conftest conftest.*; do
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+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_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { 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
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3730,17 +4436,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
@@ -3753,31 +4459,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3791,37 +4489,16 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
@@ -3830,20 +4507,16 @@ else
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
ac_cv_prog_cxx_g=no
CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3854,35 +4527,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CXXFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3893,36 +4542,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3933,42 +4558,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
@@ -4002,14 +4602,14 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -4030,18 +4630,19 @@ if test "$am__include" = "#"; then
fi
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -4055,17 +4656,18 @@ fi
depcc="$CXX" am_compiler_list=
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4099,16 +4701,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -4117,16 +4719,16 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
break
fi
;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -4165,7 +4767,7 @@ else
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
@@ -4188,9 +4790,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4201,24 +4803,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4228,9 +4830,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4241,24 +4843,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4267,7 +4869,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -4281,9 +4883,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4294,24 +4896,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4321,9 +4923,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4335,18 +4937,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -4365,10 +4967,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4380,9 +4982,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4393,24 +4995,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4424,9 +5026,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4437,24 +5039,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4467,7 +5069,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -4478,62 +5080,42 @@ fi
fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4547,37 +5129,16 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -4586,20 +5147,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4610,35 +5167,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4649,36 +5182,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
- ac_c_werror_flag=$ac_save_c_werror_flag
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4689,42 +5198,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -4741,23 +5225,18 @@ else
CFLAGS=
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4809,32 +5288,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_c89=$ac_arg
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -4845,17 +5301,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -4863,40 +5321,100 @@ 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:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+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
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
+ 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
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
@@ -4909,16 +5427,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -4927,16 +5445,16 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
break
fi
;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -4975,7 +5493,7 @@ else
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -4997,14 +5515,14 @@ 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:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -5019,11 +5537,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -5032,78 +5546,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
break
fi
@@ -5115,7 +5585,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -5126,11 +5596,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -5139,87 +5605,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -5229,9 +5648,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if ${ac_cv_path_GREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -5242,10 +5661,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
+ for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -5262,7 +5681,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
@@ -5277,26 +5696,24 @@ esac
$ac_path_GREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if ${ac_cv_path_EGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5310,10 +5727,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
+ for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -5330,7 +5747,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
@@ -5345,12 +5762,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -5358,24 +5773,20 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
- { $as_echo "$as_me:$LINENO: checking for Minix Amsterdam compiler" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
$as_echo_n "checking for Minix Amsterdam compiler... " >&6; }
-if test "${gl_cv_c_amsterdam_compiler+set}" = set; then
+if ${gl_cv_c_amsterdam_compiler+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __ACK__
@@ -5384,7 +5795,7 @@ Amsterdam
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Amsterdam" >/dev/null 2>&1; then
+ $EGREP "Amsterdam" >/dev/null 2>&1; then :
gl_cv_c_amsterdam_compiler=yes
else
gl_cv_c_amsterdam_compiler=no
@@ -5393,7 +5804,7 @@ rm -f conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_c_amsterdam_compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
$as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
if test -z "$AR"; then
if test $gl_cv_c_amsterdam_compiler = yes; then
@@ -5405,9 +5816,9 @@ $as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -5418,24 +5829,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
$as_echo "$AR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5445,9 +5856,9 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -5458,24 +5869,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
$as_echo "$ac_ct_AR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5484,7 +5895,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -5512,9 +5923,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if ${ac_cv_prog_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -5525,24 +5936,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
$as_echo "$RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5552,9 +5963,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -5565,24 +5976,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
$as_echo "$ac_ct_RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5591,7 +6002,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -5605,148 +6016,13 @@ fi
fi
-if test "x$CC" != xcc; then
- { $as_echo "$as_me:$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:$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 { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* 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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- 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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); };
-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; 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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- 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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); };
- 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:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-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
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -5761,48 +6037,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -5812,18 +6063,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -5833,14 +6080,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -5867,302 +6110,73 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+fi
+done
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
- if test "${ac_cv_header_minix_config_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-$as_echo "$ac_cv_header_minix_config_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-$as_echo_n "checking minix/config.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <minix/config.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-$as_echo_n "checking minix/config.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <minix/config.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_minix_config_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-$as_echo "$ac_cv_header_minix_config_h" >&6; }
-
-fi
-if test "x$ac_cv_header_minix_config_h" = x""yes; then
- MINIX=yes
-else
- MINIX=
-fi
+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+ MINIX=yes
+else
+ MINIX=
+fi
if test "$MINIX" = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_SOURCE 1
-_ACEOF
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_1_SOURCE 2
-_ACEOF
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define _MINIX 1
-_ACEOF
+$as_echo "#define _MINIX 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define _NETBSD_SOURCE 1
-_ACEOF
+$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
fi
-
- { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
# define __EXTENSIONS__ 1
@@ -6175,76 +6189,37 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_safe_to_define___extensions__=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_safe_to_define___extensions__=no
+ ac_cv_safe_to_define___extensions__=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
test $ac_cv_safe_to_define___extensions__ = yes &&
- cat >>confdefs.h <<\_ACEOF
-#define __EXTENSIONS__ 1
-_ACEOF
+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
-_ACEOF
+ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define _DARWIN_C_SOURCE 1
-_ACEOF
+ $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
+ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define __USE_MINGW_ANSI_STDIO 1
-_ACEOF
+ $as_echo "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
+ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define _TANDEM_SOURCE 1
-_ACEOF
+ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
- { $as_echo "$as_me:$LINENO: checking whether _XOPEN_SOURCE should be defined" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
$as_echo_n "checking whether _XOPEN_SOURCE should be defined... " >&6; }
-if test "${ac_cv_should_define__xopen_source+set}" = set; then
+if ${ac_cv_should_define__xopen_source+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_should_define__xopen_source=no
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <wchar.h>
@@ -6257,34 +6232,10 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _XOPEN_SOURCE 500
@@ -6298,44 +6249,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_should_define__xopen_source=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_should_define__xopen_source" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
$as_echo "$ac_cv_should_define__xopen_source" >&6; }
test $ac_cv_should_define__xopen_source = yes &&
- cat >>confdefs.h <<\_ACEOF
-#define _XOPEN_SOURCE 500
-_ACEOF
-
+ $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
@@ -6350,7 +6274,7 @@ _ACEOF
# Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then
+if test "${enable_threads+set}" = set; then :
enableval=$enable_threads; gl_use_threads=$enableval
else
if test -n "$gl_use_threads_default"; then
@@ -6439,7 +6363,7 @@ fi
# Code from module wctype-h:
-if test x$CC = xgcc; then
+if test x$CC = xgcc; then :
if true; then
COMPILER_IS_GCC_TRUE=
COMPILER_IS_GCC_FALSE='#'
@@ -6459,14 +6383,13 @@ fi
fi
-
for ac_prog in flex lex
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LEX+set}" = set; then
+if ${ac_cv_prog_LEX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
@@ -6477,24 +6400,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LEX="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
LEX=$ac_cv_prog_LEX
if test -n "$LEX"; then
- { $as_echo "$as_me:$LINENO: result: $LEX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
$as_echo "$LEX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6510,7 +6433,8 @@ a { ECHO; }
b { REJECT; }
c { yymore (); }
d { yyless (1); }
-e { yyless (input () != 0); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */
+ yyless ((input () != 0)); }
f { unput (yytext[0]); }
. { BEGIN INITIAL; }
%%
@@ -6523,20 +6447,20 @@ main (void)
return ! yylex () + ! yywrap ();
}
_ACEOF
-{ (ac_try="$LEX conftest.l"
+{ { ac_try="$LEX conftest.l"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$LEX conftest.l") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
$as_echo_n "checking lex output file root... " >&6; }
-if test "${ac_cv_prog_lex_root+set}" = set; then
+if ${ac_cv_prog_lex_root+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6545,19 +6469,17 @@ if test -f lex.yy.c; then
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
- { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
$as_echo "$ac_cv_prog_lex_root" >&6; }
LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
if test -z "${LEXLIB+set}"; then
- { $as_echo "$as_me:$LINENO: checking lex library" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
$as_echo_n "checking lex library... " >&6; }
-if test "${ac_cv_lib_lex+set}" = set; then
+if ${ac_cv_lib_lex+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6565,55 +6487,29 @@ else
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
`cat $LEX_OUTPUT_ROOT.c`
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_lex=$ac_lib
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
test "$ac_cv_lib_lex" != 'none needed' && break
done
LIBS=$ac_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
$as_echo "$ac_cv_lib_lex" >&6; }
test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
fi
-{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
@@ -6622,52 +6518,25 @@ else
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#define YYTEXT_POINTER 1
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define YYTEXT_POINTER 1
`cat $LEX_OUTPUT_ROOT.c`
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_prog_lex_yytext_pointer=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
if test $ac_cv_prog_lex_yytext_pointer = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define YYTEXT_POINTER 1
-_ACEOF
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
@@ -6676,151 +6545,59 @@ fi
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; 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, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
$as_echo_n "(cached) " >&6
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- fi
- done
- done
- ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
*)
eval ac_cv_prog_make_${ac_make}_set=no;;
esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
case `pwd` in
*\ * | *\ *)
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.4'
+macro_revision='1.3293'
@@ -6836,9 +6613,78 @@ macro_revision='1.3017'
ltmain="$ac_aux_dir/ltmain.sh"
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
+else
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO ""
+}
+
+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
+$as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -6846,7 +6692,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- $as_unset ac_script || ac_script=
+ { ac_script=; unset ac_script;}
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
@@ -6855,10 +6701,10 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
+ for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -6875,7 +6721,7 @@ case `"$ac_path_SED" --version 2>&1` in
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
@@ -6890,19 +6736,17 @@ esac
$ac_path_SED_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
@@ -6920,9 +6764,9 @@ Xsed="$SED -e 1s/^X//"
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then
+if ${ac_cv_path_FGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6936,10 +6780,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in fgrep; do
+ for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -6956,7 +6800,7 @@ case `"$ac_path_FGREP" --version 2>&1` in
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
@@ -6971,12 +6815,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -6984,7 +6826,7 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
@@ -7010,7 +6852,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
@@ -7019,7 +6861,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+ { $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*)
@@ -7049,13 +6891,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -7086,18 +6928,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -7110,7 +6950,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -7122,9 +6962,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+if ${lt_cv_path_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -7171,20 +7011,23 @@ else
: ${lt_cv_path_NM=no}
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+{ $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"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$ac_tool_prefix"; then
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+if ${ac_cv_prog_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -7195,24 +7038,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
DUMPBIN=$ac_cv_prog_DUMPBIN
if test -n "$DUMPBIN"; then
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
$as_echo "$DUMPBIN" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7222,13 +7065,13 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
@@ -7239,24 +7082,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
if test -n "$ac_ct_DUMPBIN"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
$as_echo "$ac_ct_DUMPBIN" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7269,7 +7112,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7277,6 +7120,15 @@ esac
fi
fi
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -7289,33 +7141,33 @@ test -z "$NM" && NM=nm
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then
+if ${lt_cv_nm_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7299: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7302: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7305: output\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
fi
rm -f conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
$as_echo "$lt_cv_nm_interface" >&6; }
# find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
@@ -7348,6 +7200,11 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -7412,8 +7269,8 @@ else
# 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"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -7433,10 +7290,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+ { $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
- { $as_echo "$as_me:$LINENO: result: none" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
@@ -7450,27 +7307,27 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+{ $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"}, \
- = c,a/b,, \
+ 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:$LINENO: result: $xsi_shell" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
$as_echo "$xsi_shell" >&6; }
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+{ $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:$LINENO: result: $lt_shell_append" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
$as_echo "$lt_shell_append" >&6; }
@@ -7505,14 +7362,88 @@ esac
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+ ;;
+ esac
+ ;;
+ *-*-cygwin* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+ ;;
+ esac
+ ;;
+ * ) # unhandled hosts (and "normal" native builds)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ esac
+ ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
+if ${lt_cv_ld_reload_flag+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
@@ -7521,6 +7452,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -7541,9 +7477,9 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+if ${ac_cv_prog_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -7554,24 +7490,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OBJDUMP=$ac_cv_prog_OBJDUMP
if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
$as_echo "$OBJDUMP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7581,9 +7517,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -7594,24 +7530,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
$as_echo "$ac_ct_OBJDUMP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7620,7 +7556,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7640,9 +7576,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
+if ${lt_cv_deplibs_check_method+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -7684,16 +7620,18 @@ mingw* | pw32*)
# 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.
- if ( file / ) >/dev/null 2>&1; then
+ # 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
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -7723,6 +7661,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -7731,11 +7673,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -7757,7 +7699,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -7836,8 +7778,23 @@ tpf*)
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -7853,145 +7810,362 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
+if ${ac_cv_prog_DLLTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
else
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_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
-$as_echo "$AR" >&6; }
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
-if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
else
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_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_AR" = x; then
- AR="false"
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- AR=$ac_ct_AR
+ DLLTOOL=$ac_ct_DLLTOOL
fi
else
- AR="$ac_cv_prog_AR"
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
fi
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+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
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ for ac_prog in ar
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
else
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_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$AR" && break
+ done
+fi
+if test -z "$AR"; then
+ ac_ct_AR=$AR
+ for ac_prog in ar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+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_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_AR" && break
+done
+
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ar_at_file=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ echo conftest.$ac_objext > conftest.lst
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; 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
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $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
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+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_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8001,9 +8175,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -8014,24 +8188,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
$as_echo "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8040,7 +8214,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8060,9 +8234,9 @@ test -z "$STRIP" && STRIP=:
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if ${ac_cv_prog_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -8073,24 +8247,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
$as_echo "$RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8100,9 +8274,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -8113,24 +8287,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
$as_echo "$ac_ct_RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8139,7 +8313,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8173,6 +8347,18 @@ if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
@@ -8217,9 +8403,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -8280,8 +8466,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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 -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'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -8317,6 +8503,7 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -8335,18 +8522,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -8358,6 +8545,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
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
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT_DLSYM_CONST
+#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
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -8369,7 +8568,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-const struct {
+LT_DLSYM_CONST struct {
const char *name;
void *address;
}
@@ -8395,19 +8594,19 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
+ LIBS=$lt_globsym_save_LIBS
+ CFLAGS=$lt_globsym_save_CFLAGS
else
echo "cannot find nm_test_func in $nlist" >&5
fi
@@ -8437,13 +8636,32 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { $as_echo "$as_me:$LINENO: result: failed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
$as_echo "failed" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: ok" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
fi
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8458,15 +8676,45 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+ withval=$with_sysroot;
+else
+ with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ { $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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
@@ -8478,11 +8726,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
@@ -8496,12 +8744,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8499 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ 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:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
@@ -8535,11 +8783,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -8588,9 +8836,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+ { $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; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
+if ${lt_cv_cc_needs_belf+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
@@ -8599,11 +8847,7 @@ 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
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -8614,38 +8858,13 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_cc_needs_belf=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8653,7 +8872,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+{ $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
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -8663,11 +8882,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
@@ -8687,15 +8906,132 @@ esac
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.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$MANIFEST_TOOL"; then
+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+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_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+ # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_MANIFEST_TOOL"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+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_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
+ MANIFEST_TOOL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+ fi
+else
+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&5
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*
+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
+ MANIFEST_TOOL=:
+fi
+
+
+
+
+
case $host_os in
rhapsody* | darwin*)
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
@@ -8706,24 +9042,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
$as_echo "$DSYMUTIL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8733,9 +9069,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
@@ -8746,24 +9082,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
$as_echo "$ac_ct_DSYMUTIL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8772,7 +9108,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8785,9 +9121,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
+if ${ac_cv_prog_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
@@ -8798,24 +9134,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
$as_echo "$NMEDIT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8825,9 +9161,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
@@ -8838,24 +9174,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
$as_echo "$ac_ct_NMEDIT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8864,7 +9200,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8877,9 +9213,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then
+if ${ac_cv_prog_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
@@ -8890,24 +9226,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
LIPO=$ac_cv_prog_LIPO
if test -n "$LIPO"; then
- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
$as_echo "$LIPO" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8917,9 +9253,9 @@ if test -z "$ac_cv_prog_LIPO"; then
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
@@ -8930,24 +9266,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
if test -n "$ac_ct_LIPO"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
$as_echo "$ac_ct_LIPO" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8956,7 +9292,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8969,9 +9305,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then
+if ${ac_cv_prog_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
@@ -8982,24 +9318,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OTOOL=$ac_cv_prog_OTOOL
if test -n "$OTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
$as_echo "$OTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -9009,9 +9345,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
@@ -9022,24 +9358,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
if test -n "$ac_ct_OTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
$as_echo "$ac_ct_OTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -9048,7 +9384,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -9061,9 +9397,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
+if ${ac_cv_prog_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
@@ -9074,24 +9410,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OTOOL64=$ac_cv_prog_OTOOL64
if test -n "$OTOOL64"; then
- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
$as_echo "$OTOOL64" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -9101,9 +9437,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
@@ -9114,24 +9450,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
if test -n "$ac_ct_OTOOL64"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
$as_echo "$ac_ct_OTOOL64" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -9140,7 +9476,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -9176,9 +9512,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
@@ -9203,22 +9539,18 @@ else
rm -f conftest.*
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
echo "_main" > conftest.sym
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -9229,43 +9561,50 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_ld_exported_symbols_list=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_ld_exported_symbols_list=no
+ lt_cv_ld_exported_symbols_list=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+ echo "$AR cru libconftest.a conftest.o" >&5
+ $AR cru libconftest.a conftest.o 2>&5
+ echo "$RANLIB libconftest.a" >&5
+ $RANLIB libconftest.a 2>&5
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -9293,7 +9632,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -9301,62 +9640,13 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
;;
esac
-
for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
_ACEOF
fi
@@ -9365,807 +9655,176 @@ done
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-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_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+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}\$%%"`;;
+ esac
+} # func_stripname_cnf
- test -n "$CXX" && break
- done
-fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-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_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
- test -n "$ac_ct_CXX" && break
-done
- if test "x$ac_ct_CXX" = x; then
- CXX="g++"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CXX=$ac_ct_CXX
- fi
-fi
+# Set options
- fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
+ enable_dlopen=no
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_compiler_gnu=no
-fi
+ enable_win32_dll=no
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GXX=yes
+ # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
else
- GXX=
+ enable_shared=yes
fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
- ac_cv_prog_cxx_g=no
- CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- CXXFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
+
+ # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ enable_static=yes
+fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+ withval=$with_pic; pic_mode="$withval"
else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
+ pic_mode=default
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="$CXX" am_compiler_list=
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
+test -z "$pic_mode" && pic_mode=default
- am_cv_CXX_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
+
+
+
+
+ # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ 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,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
;;
- none) break ;;
esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
else
- am_cv_CXX_dependencies_compiler_type=none
+ enable_fast_install=yes
fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
-else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
-fi
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
- if test "${ac_cv_prog_CXXCPP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CXXCPP needs to be expanded
- for CXXCPP in "$CXX -E" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
- done
- ac_cv_prog_CXXCPP=$CXXCPP
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
-fi
- CXXCPP=$ac_cv_prog_CXXCPP
-else
- ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
-else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-_lt_caught_CXX_error=yes; }
-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
-else
- _lt_caught_CXX_error=yes
-fi
-# Set options
- enable_dlopen=no
- enable_win32_dll=no
- # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
- enableval=$enable_shared; p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_shared=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_shared=yes
-fi
+test -z "$LN_S" && LN_S="ln -s"
- # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
- enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_static=yes
-fi
@@ -10176,195 +9835,72 @@ fi
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
- withval=$with_pic; pic_mode="$withval"
+
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- pic_mode=default
+ rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
-test -z "$pic_mode" && pic_mode=default
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
- # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
- enableval=$enable_fast_install; p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- 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,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_fast_install=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_fast_install=yes
-fi
+case $host_os in
+aix3*)
+ # 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
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
+esac
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+# 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"
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-case $host_os in
-aix3*)
- # 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
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# 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.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# 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"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
for cc_temp in $compiler""; do
case $cc_temp in
@@ -10374,7 +9910,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
# Only perform the check for file, if the check method requires it
@@ -10382,9 +9918,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -10435,10 +9971,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -10448,9 +9984,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
- { $as_echo "$as_me:$LINENO: checking for file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -10501,10 +10037,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -10583,11 +10119,16 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+ *)
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+ esac
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
@@ -10603,15 +10144,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10606: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10610: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
@@ -10620,7 +10161,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+{ $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
@@ -10640,8 +10181,6 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -10689,6 +10228,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -10731,6 +10276,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
+ lt_prog_compiler_pic='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -10772,7 +10324,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -10793,7 +10345,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@ -10805,25 +10363,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-qpic'
lt_prog_compiler_static='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_wl=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
+ lt_prog_compiler_wl='-Wl,'
;;
esac
;;
@@ -10855,7 +10413,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
@@ -10912,21 +10470,25 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
@@ -10942,15 +10504,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10945: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10949: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
@@ -10959,7 +10521,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+{ $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
@@ -10979,13 +10541,18 @@ fi
+
+
+
+
+
#
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
@@ -10998,7 +10565,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
@@ -11011,7 +10578,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+{ $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
@@ -11026,9 +10593,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -11047,16 +10614,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11050: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11054: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -11073,7 +10640,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
@@ -11081,9 +10648,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -11102,16 +10669,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11105: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11109: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -11128,7 +10695,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
@@ -11137,7 +10704,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+ { $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; }
hard_links=yes
$RM conftest*
@@ -11145,10 +10712,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+ { $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:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ { $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
@@ -11161,7 +10728,7 @@ fi
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
@@ -11224,7 +10791,33 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
ld_shlibs=yes
+
+ # 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
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -11242,6 +10835,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
fi
supports_anon_versioning=no
case `$LD -v 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 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -11257,11 +10851,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -11297,10 +10892,12 @@ _LT_EOF
# _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'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ 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'
@@ -11318,6 +10915,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -11333,7 +10935,7 @@ _LT_EOF
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)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -11343,15 +10945,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=
+ 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; $ECHO \"$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*) # 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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ 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'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -11362,13 +10965,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ 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'
+ 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; $ECHO \"$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
@@ -11384,17 +10991,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ 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=
hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; 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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -11408,8 +11015,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- 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'
+ 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
;;
@@ -11427,8 +11034,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 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'
+ 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
@@ -11474,8 +11081,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 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'
+ 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
@@ -11515,8 +11122,10 @@ _LT_EOF
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".
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")) && (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) != ".")) { 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'
fi
@@ -11603,11 +11212,13 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11618,54 +11229,34 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+fi
+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"
+ fi
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ 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"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -11674,11 +11265,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11689,59 +11282,44 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+fi
+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"
+ fi
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ aix_libpath=$lt_cv_aix_libpath_
+fi
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'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
+ if test "$with_gnu_ld" = yes; 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'
+ 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'
@@ -11773,30 +11351,77 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_from_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
- ;;
-
- darwin* | rhapsody*)
-
-
- archive_cmds_need_lc=no
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
+ case $cc_basename in
+ cl*)
+ # Native MSVC
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ file_list_spec='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ 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='
+ # 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
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ # 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'
+ ;;
+ *)
+ # Assume MSVC wrapper
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ 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.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ enable_shared_with_static_runtimes=yes
+ ;;
+ esac
+ ;;
+
+ darwin* | rhapsody*)
+
+
+ archive_cmds_need_lc=no
+ 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\"`'
+ else
+ whole_archive_flag_spec=''
+ fi
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -11804,7 +11429,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ 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}"
@@ -11847,7 +11472,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
@@ -11855,7 +11480,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hpux9*)
if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ 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'
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'
fi
@@ -11870,8 +11495,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 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'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -11889,16 +11514,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared -fPIC ${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 -fPIC ${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
@@ -11910,7 +11535,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler__b=no
+ 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
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler__b=yes
+ fi
+ else
+ lt_cv_prog_compiler__b=yes
+ fi
+ fi
+ $RM -r conftest*
+ 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'
+else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
;;
esac
fi
@@ -11938,52 +11602,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 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.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat >conftest.$ac_ext <<_ACEOF
-int foo(void) {}
+ # This should be the same for all languages, so no per-tag cache variable.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+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"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo (void) { return 0; }
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+if ac_fn_c_try_link "$LINENO"; then :
+ lt_cv_irix_exported_symbol=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+ lt_cv_irix_exported_symbol=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ 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'
+ fi
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -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'
@@ -12045,17 +11696,17 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
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'
+ 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'
;;
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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 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" && $ECHO "X-set_version $verstring" | $Xsed` -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'
@@ -12065,13 +11716,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
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} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -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'
@@ -12084,9 +11735,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 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 ${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"*)
@@ -12235,7 +11886,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
@@ -12272,46 +11923,52 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc=no
- else
- archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ then
+ lt_cv_archive_cmds_need_lc=no
+ else
+ lt_cv_archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
;;
esac
fi
@@ -12474,7 +12131,7 @@ esac
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ { $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
@@ -12482,16 +12139,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ 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
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -12504,7 +12168,7 @@ if test "$GCC" = yes; then
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 '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -12524,7 +12188,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # 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'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@ -12612,7 +12282,7 @@ amigaos*)
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=`$ECHO "X$lib" | $Xsed -e '\''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%'\''`; 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'
;;
esac
;;
@@ -12643,8 +12313,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -12665,36 +12336,83 @@ cygwin* | mingw* | pw32* | cegcc*)
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}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+ 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}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
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}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ 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"
+ 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'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ 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'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -12781,6 +12499,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ 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'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -12823,8 +12554,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[3-9]*)
@@ -12882,7 +12615,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -12891,16 +12624,17 @@ linux* | k*bsd*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -12911,56 +12645,29 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
- shlibpath_overrides_runpath=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+ lt_cv_shlibpath_overrides_runpath=yes
fi
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# 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
- # 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
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;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ 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="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -13160,7 +12867,7 @@ uts4*)
dynamic_linker=no
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -13262,7 +12969,12 @@ fi
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
@@ -13287,7 +12999,7 @@ else
# directories.
hardcode_action=unsupported
fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
@@ -13332,18 +13044,14 @@ else
darwin*)
# if libdl is installed we need to link against it
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13361,43 +13069,18 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $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" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -13410,33 +13093,19 @@ fi
;;
*)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
+ 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"
+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; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -13445,13 +13114,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
int
main ()
{
@@ -13460,56 +13122,32 @@ return shl_load ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shl_load=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dld_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
- lt_cv_dlopen="shl_load"
+{ $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"
else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+ 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; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13518,222 +13156,37 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char shl_load ();
+char dlopen ();
int
main ()
{
-return shl_load ();
+return dlopen ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dld_shl_load=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$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" = x""yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+{ $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"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
- lt_cv_dlopen="dlopen"
-else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dl_dlopen=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13751,57 +13204,28 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_svld_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+{ $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" = x""yes; then
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+if ${ac_cv_lib_dld_dld_link+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13819,43 +13243,18 @@ return dld_link ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dld_dld_link=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+{ $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" = x""yes; then
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -13894,9 +13293,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
+if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -13905,7 +13304,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13908 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13946,7 +13345,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -13955,7 +13360,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -13964,11 +13373,11 @@ int main ()
return status;
}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ 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
@@ -13985,14 +13394,14 @@ rm -fr conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+{ $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
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+ { $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 test "${lt_cv_dlopen_self_static+set}" = set; then
+if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -14001,7 +13410,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14004 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14042,7 +13451,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -14051,7 +13466,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -14060,11 +13479,11 @@ int main ()
return status;
}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ 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
@@ -14081,7 +13500,7 @@ rm -fr conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
@@ -14120,12 +13539,12 @@ fi
striplib=
old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
@@ -14134,15 +13553,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
;;
*)
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
;;
esac
@@ -14160,12 +13579,12 @@ fi
# Report which library types will actually be built
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ { $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:$LINENO: result: $can_build_shared" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
$as_echo "$can_build_shared" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+ { $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
@@ -14186,14 +13605,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
fi
;;
esac
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
$as_echo "$enable_shared" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+ { $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
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -14208,55 +13627,196 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$lt_save_CC"
-
-ac_ext=cpp
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+ if ${ac_cv_prog_CXXCPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-compiler_needs_object_CXX=no
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_direct_absolute_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-inherit_rpath_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-# Source file extension for C++ test sources.
-ac_ext=cpp
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
-# No sense in running all these tests if we already determined that
-# 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
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="int some_variable = 0;"
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
- # Code to be used in simple link tests
- lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+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
+
+else
+ _lt_caught_CXX_error=yes
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# 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
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
@@ -14289,6 +13849,7 @@ $RM -r conftest*
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+ lt_save_CFLAGS=$CFLAGS
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
@@ -14306,6 +13867,7 @@ $RM -r conftest*
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
+ CFLAGS=$CXXFLAGS
compiler=$CC
compiler_CXX=$CC
for cc_temp in $compiler""; do
@@ -14316,7 +13878,7 @@ $RM -r conftest*
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
if test -n "$compiler"; then
@@ -14334,7 +13896,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
@@ -14343,7 +13905,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+ { $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*)
@@ -14373,13 +13935,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -14410,18 +13972,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -14434,7 +13994,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -14447,8 +14007,8 @@ with_gnu_ld=$lt_cv_prog_gnu_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
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared -nostdlib $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 $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'
@@ -14480,7 +14040,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# 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 "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
GXX=no
@@ -14489,7 +14049,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
fi
# PORTME: fill in a description of your system's C++ link characteristics
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
@@ -14590,11 +14150,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath__CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -14605,55 +14167,35 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_link "$LINENO"; then :
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath__CXX"; then
+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+fi
+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"
+ fi
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ aix_libpath=$lt_cv_aix_libpath__CXX
+fi
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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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 "x${allow_undefined_flag}" != "x"; 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'
@@ -14662,11 +14204,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath__CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -14677,59 +14221,44 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_link "$LINENO"; then :
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath__CXX"; then
+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+fi
+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"
+ fi
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ aix_libpath=$lt_cv_aix_libpath__CXX
+fi
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'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_CXX='$convenience'
+ if test "$with_gnu_ld" = yes; 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'
+ 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.
@@ -14759,28 +14288,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
cygwin* | mingw* | pw32* | cegcc*)
- # _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'
- 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'
- else
- ld_shlibs_CXX=no
- fi
- ;;
+ case $GXX,$cc_basename in
+ ,cl* | no,cl*)
+ # Native MSVC
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec_CXX=' '
+ allow_undefined_flag_CXX=unsupported
+ always_export_symbols_CXX=yes
+ file_list_spec_CXX='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ 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='
+ # 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'
+ ;;
+ *)
+ # 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'
+ 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'
+ else
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ esac
+ ;;
darwin* | rhapsody*)
@@ -14788,7 +14364,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX=''
+ 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\"`'
+ else
+ whole_archive_flag_spec_CXX=''
+ fi
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -14796,7 +14376,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ 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}"
@@ -14849,6 +14429,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
gnu*)
;;
+ haiku*)
+ 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_separator_CXX=:
@@ -14873,11 +14458,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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; $ECHO "X$list" | $Xsed'
+ 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 -fPIC ${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 -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'
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -14938,7 +14523,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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; $ECHO "X$list" | $Xsed'
+ 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
@@ -14948,10 +14533,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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 -fPIC ${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 -fPIC ${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
@@ -14981,7 +14566,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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" && $ECHO "X-set_version $verstring" | $Xsed` -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
@@ -14992,9 +14577,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -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"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -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
@@ -15005,7 +14590,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -15023,7 +14608,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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; $ECHO "X$list" | $Xsed'
+ 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'
@@ -15060,26 +14645,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
- *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+ *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 | $NL2SP`"'
+ 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 | $NL2SP`~
+ $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 | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $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 | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ $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 will use weak symbols
+ *) # 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'
;;
@@ -15087,7 +14672,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ 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++
@@ -15106,9 +14691,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "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*)
+ 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'
@@ -15128,13 +14713,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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; $ECHO \"$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
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
# would be better.
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -15203,7 +14788,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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=echo
+ output_verbose_link_cmd=func_echo_all
else
ld_shlibs_CXX=no
fi
@@ -15238,15 +14823,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ 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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $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'
;;
@@ -15262,17 +14847,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 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}\*'
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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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 -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${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
@@ -15282,7 +14867,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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 "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -15318,7 +14903,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
@@ -15339,7 +14924,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
link_all_deplibs_CXX=yes
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -15359,14 +14944,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $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 -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 -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 "\-L"'
+ 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
# platform.
@@ -15377,7 +14962,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ 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'
@@ -15431,6 +15016,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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'
+ old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+ '"$old_archive_cmds_CXX"
+ reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+ '"$reload_cmds_CXX"
;;
*)
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -15464,7 +15053,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
esac
- { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ { $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
@@ -15492,11 +15081,18 @@ private:
};
_LT_EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+esac
+
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -15505,7 +15101,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case $p in
+ case ${prev}${p} in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
@@ -15514,13 +15110,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
test $p = "-R"; then
prev=$p
continue
- else
- prev=
fi
+ # Expand the sysroot to ease extracting the directories later.
+ if test -z "$prev"; then
+ case $p in
+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+ esac
+ fi
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
+ 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.
@@ -15540,8 +15145,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
postdeps_CXX="${postdeps_CXX} ${prev}${p}"
fi
fi
+ prev=
;;
+ *.lto.$objext) ;; # Ignore GCC LTO objects
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
@@ -15577,6 +15184,7 @@ else
fi
$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -15612,7 +15220,7 @@ linux*)
solaris*)
case $cc_basename in
- CC*)
+ 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
@@ -15677,8 +15285,6 @@ fi
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -15728,6 +15334,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static_CXX=
+ ;;
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -15777,6 +15388,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
esac
;;
+ mingw* | cygwin* | os2* | pw32* | 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_CXX='-DDLL_EXPORT'
+ ;;
dgux*)
case $cc_basename in
ec++*)
@@ -15833,7 +15449,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
esac
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -15866,8 +15482,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
- xlc* | xlC*)
- # IBM XL 8.0 on PPC
+ xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-qpic'
lt_prog_compiler_static_CXX='-qstaticlink'
@@ -15929,7 +15545,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
@@ -15994,18 +15610,25 @@ case $host_os in
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
@@ -16021,15 +15644,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16024: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16028: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works_CXX=yes
@@ -16038,7 +15661,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+{ $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
@@ -16055,13 +15678,15 @@ fi
+
+
#
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
@@ -16074,7 +15699,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works_CXX=yes
@@ -16087,7 +15712,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+{ $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
@@ -16099,9 +15724,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
@@ -16120,16 +15745,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16123: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16127: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
@@ -16146,14 +15771,14 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
@@ -16172,16 +15797,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16175: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16179: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
@@ -16198,7 +15823,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
@@ -16207,7 +15832,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+ { $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; }
hard_links=yes
$RM conftest*
@@ -16215,10 +15840,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+ { $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:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ { $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
@@ -16228,33 +15853,41 @@ fi
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
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".
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")) && (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) != ".")) { 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'
fi
;;
pw32*)
export_symbols_cmds_CXX="$ltdll_cmds"
- ;;
+ ;;
cygwin* | mingw* | cegcc*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ case $cc_basename in
+ cl*) ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+ ;;
+ esac
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ ;;
esac
- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+{ $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
@@ -16282,46 +15915,52 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl_CXX
- pic_flag=$lt_prog_compiler_pic_CXX
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
- allow_undefined_flag_CXX=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl_CXX
+ pic_flag=$lt_prog_compiler_pic_CXX
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+ allow_undefined_flag_CXX=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_CXX=no
- else
- archive_cmds_need_lc_CXX=yes
- fi
- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ then
+ lt_cv_archive_cmds_need_lc_CXX=no
+ else
+ lt_cv_archive_cmds_need_lc_CXX=yes
+ fi
+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+ archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
;;
esac
fi
@@ -16391,7 +16030,7 @@ esac
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
@@ -16478,7 +16117,7 @@ amigaos*)
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=`$ECHO "X$lib" | $Xsed -e '\''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%'\''`; 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'
;;
esac
;;
@@ -16509,8 +16148,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -16531,36 +16171,82 @@ cygwin* | mingw* | pw32* | cegcc*)
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}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
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}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ 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"
+ 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'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ 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'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -16646,6 +16332,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ 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'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -16688,8 +16387,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[3-9]*)
@@ -16747,7 +16448,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -16756,16 +16457,17 @@ linux* | k*bsd*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16776,56 +16478,29 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
- shlibpath_overrides_runpath=yes
+if ac_fn_cxx_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+ lt_cv_shlibpath_overrides_runpath=yes
fi
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# 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
- # 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
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;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ 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="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17025,7 +16700,7 @@ uts4*)
dynamic_linker=no
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -17076,7 +16751,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
@@ -17101,7 +16778,7 @@ else
# directories.
hardcode_action_CXX=unsupported
fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
@@ -17123,6 +16800,7 @@ fi
fi # test -n "$compiler"
CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
@@ -17162,9 +16840,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Extract the first word of "bison", so it can be a program name with args.
set dummy bison; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then
+if ${ac_cv_prog_YACC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
@@ -17175,24 +16853,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_YACC="bison"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
YACC=$ac_cv_prog_YACC
if test -n "$YACC"; then
- { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
$as_echo "$YACC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -17200,7 +16878,7 @@ fi
bison_version=`bison --version | sed -n '/^bison.*/p' | sed 's at .* \(.*\)@\1@'`
-{ $as_echo "$as_me:$LINENO: checking for bison 3.0" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison 3.0" >&5
$as_echo_n "checking for bison 3.0... " >&6; }
# This was used to set a conditional in the d4_ce/Makefile.am to build
@@ -17211,35 +16889,29 @@ $as_echo_n "checking for bison 3.0... " >&6; }
as_arg_v1="$bison_version"
as_arg_v2="3.0"
awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in
-1) { { $as_echo "$as_me:$LINENO: error: not found" >&5
-$as_echo "$as_me: error: not found" >&2;}
- { (exit 1); exit 1; }; };;
-0) ;;
-2) ;;
+case $? in #(
+ 1) :
+ as_fn_error $? "not found" "$LINENO" 5 ;; #(
+ 0) :
+ ;; #(
+ 2) :
+ ;; #(
+ *) :
+ ;;
esac
-{ $as_echo "$as_me:$LINENO: result: found vesion $bison_version" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found vesion $bison_version" >&5
$as_echo "found vesion $bison_version" >&6; }
-
-
-
-
-
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${$as_ac_Header+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <$ac_hdr>
@@ -17253,41 +16925,17 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_ac_Header=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_ac_Header
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
@@ -17298,17 +16946,13 @@ fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+if ${ac_cv_search_opendir+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17333,70 +16977,39 @@ for ac_lib in '' dir; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_opendir=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_opendir+:} false; then :
break
fi
done
-if test "${ac_cv_search_opendir+set}" = set; then
- :
+if ${ac_cv_search_opendir+:} false; then :
+
else
ac_cv_search_opendir=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
$as_echo "$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
else
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+if ${ac_cv_search_opendir+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17421,70 +17034,39 @@ for ac_lib in '' x; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_opendir=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_opendir+:} false; then :
break
fi
done
-if test "${ac_cv_search_opendir+set}" = set; then
- :
+if ${ac_cv_search_opendir+:} false; then :
+
else
ac_cv_search_opendir=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
$as_echo "$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -17499,48 +17081,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -17550,18 +17107,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -17571,14 +17124,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -17605,64 +17154,31 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
+if ${ac_cv_header_sys_wait_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/wait.h>
@@ -17683,191 +17199,31 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_sys_wait_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_sys_wait_h=no
+ ac_cv_header_sys_wait_h=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
$as_echo "$ac_cv_header_sys_wait_h" >&6; }
if test $ac_cv_header_sys_wait_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-for ac_header in $ac_header_list
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
- ac_header_compiler=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_header in $ac_header_list
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -17904,375 +17260,57 @@ done
+for ac_header in uuid/uuid.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_UUID_UUID_H 1
+_ACEOF
+ found_uuid_uuid_h=true
+else
+ found_uuid_uuid_h=false
+fi
+done
+for ac_header in uuid.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_uuid_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_UUID_H 1
+_ACEOF
+ found_uuid_h=true
+else
+ found_uuid_h=false
+fi
+done
+if test $found_uuid_uuid_h = true -o $found_uuid_h = true; then :
+else
+ as_fn_error $? "Could not find uuid.h" "$LINENO" 5
+fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in uuid/uuid.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
$as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- found_uuid_uuid_h=true
-else
- found_uuid_uuid_h=false
-fi
-
-done
-
-
-for ac_header in uuid.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- found_uuid_h=true
-else
- found_uuid_h=false
-fi
-
-done
-
-
-if test $found_uuid_uuid_h = true -o $found_uuid_h = true; then
- :
-else
- { { $as_echo "$as_me:$LINENO: error: Could not find uuid.h" >&5
-$as_echo "$as_me: error: Could not find uuid.h" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
-/* FIXME: Include the comments suggested by Paul. */
+
#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
+ /* Ultrix mips cc rejects this sort of thing. */
typedef int charset[2];
- const charset cs;
+ const charset cs = { 0, 0 };
/* SunOS 4.1.1 cc rejects this. */
char const *const *pcpcc;
char **ppc;
@@ -18289,8 +17327,9 @@ main ()
++pcpcc;
ppc = (char**) pcpcc;
pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -18306,10 +17345,10 @@ main ()
iptr p = 0;
++p;
}
- { /* AIX XL C 1.02.0.0 rejects this saying
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -18322,56 +17361,29 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_const=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_const=no
+ ac_cv_c_const=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
+if ${ac_cv_c_inline+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
@@ -18380,41 +17392,17 @@ $ac_kw foo_t foo () {return 0; }
#endif
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_inline=$ac_kw
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
test "$ac_cv_c_inline" != no && break
done
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
$as_echo "$ac_cv_c_inline" >&6; }
-
case $ac_cv_c_inline in
inline | yes) ;;
*)
@@ -18430,290 +17418,72 @@ _ACEOF
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
- $as_echo_n "(cached) " >&6
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
else
- ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (size_t))
- return 0;
- ;
- return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+
+fi
+
+ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
int
main ()
{
-if (sizeof ((size_t)))
- return 0;
+if ((struct tm *) 0)
+return 0;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_size_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_time=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+ ac_cv_header_time=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
-else
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
-$as_echo_n "checking for struct stat.st_blksize... " >&6; }
-if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_blksize)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_blksize=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_blksize)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_stat_st_blksize=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_stat_st_blksize=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
-$as_echo "$ac_cv_member_struct_stat_st_blksize" >&6; }
-if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-_ACEOF
-
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_time=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_time=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <time.h>
-
+#include <sys/types.h>
+#include <time.h>
+
int
main ()
{
@@ -18724,54 +17494,27 @@ struct tm tm;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_struct_tm=time.h
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_struct_tm=sys/time.h
+ ac_cv_struct_tm=sys/time.h
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: checking for working volatile" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
$as_echo_n "checking for working volatile... " >&6; }
-if test "${ac_cv_c_volatile+set}" = set; then
+if ${ac_cv_c_volatile+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -18785,57 +17528,29 @@ return !x && !y;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_volatile=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_volatile=no
+ ac_cv_c_volatile=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
$as_echo "$ac_cv_c_volatile" >&6; }
if test $ac_cv_c_volatile = no; then
-cat >>confdefs.h <<\_ACEOF
-#define volatile /**/
-_ACEOF
+$as_echo "#define volatile /**/" >>confdefs.h
fi
-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
+if ${ac_cv_c_bigendian+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
# See if we're dealing with a universal compiler.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
@@ -18843,46 +17558,34 @@ cat >>conftest.$ac_ext <<_ACEOF
typedef int dummy;
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
# Check for potential -arch flags. It is not universal unless
- # there are some -arch flags. Note that *ppc* also matches
- # ppc64. This check is also rather less than ideal.
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
- esac
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+ # there are at least two -arch flags with different values.
+ ac_arch=
+ ac_prev=
+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ if test -n "$ac_prev"; then
+ case $ac_word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ ac_arch=$ac_word
+ else
+ ac_cv_c_bigendian=universal
+ break
+ fi
+ ;;
+ esac
+ ac_prev=
+ elif test "x$ac_word" = "x-arch"; then
+ ac_prev=arch
+ fi
+ done
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_c_bigendian = unknown; then
# See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
@@ -18900,30 +17603,9 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
# It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
@@ -18939,49 +17621,18 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_bigendian=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <limits.h>
@@ -18996,30 +17647,9 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
# It does; now see whether it defined to _BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <limits.h>
@@ -19034,51 +17664,20 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_bigendian=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# Compile a test program.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
# Try to guess by grepping values from an object file.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -19104,24 +17703,7 @@ return use_ascii (foo) == use_ebcdic (foo);
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
@@ -19133,20 +17715,10 @@ $as_echo "$ac_try_echo") >&5
ac_cv_c_bigendian=unknown
fi
fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
@@ -19166,81 +17738,46 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_c_bigendian=no
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
+ ac_cv_c_bigendian=yes
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
$as_echo "$ac_cv_c_bigendian" >&6; }
case $ac_cv_c_bigendian in #(
yes)
- cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
;; #(
no)
;; #(
universal)
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
;; #(
*)
- { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
# This is used byt eh DMR tests which must choose the correct set of baselines
# based on word order given that DAP4 uses 'reader make right' and thus the
# DAP4 data responses are different for different word order machines. jhrg 9/29/15
-if test $ac_cv_c_bigendian = yes; then
+if test $ac_cv_c_bigendian = yes; then :
ac_word_order=big-endian
else
ac_word_order=little-endian
fi
-
# Ignore the errors about AC_TRY_RUN missing an argument. jhrg 5/2/95
@@ -19249,3860 +17786,2322 @@ fi
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
$as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
+if ${ac_cv_sizeof_int+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
-test_array [0] = 0
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if test "$ac_cv_type_int" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_int=0
+ fi
+fi
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
+
+ # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+else
+ if test "$ac_cv_type_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_long=0
+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
+
+
+ # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
+$as_echo_n "checking size of char... " >&6; }
+if ${ac_cv_sizeof_char+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then :
- ac_lo= ac_hi=
+else
+ if test "$ac_cv_type_char" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (char)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_char=0
+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
+$as_echo_n "checking size of double... " >&6; }
+if ${ac_cv_sizeof_double+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_double" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+as_fn_error 77 "cannot compute sizeof (double)
+See \`config.log' for more details" "$LINENO" 5; }
else
- ac_cv_sizeof_int=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (int)); }
-static unsigned long int ulongval () { return (long int) (sizeof (int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
+ ac_cv_sizeof_double=0
+ fi
+fi
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (int))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (int))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (int))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
+$as_echo "$ac_cv_sizeof_double" >&6; }
- ;
- return 0;
-}
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_DOUBLE $ac_cv_sizeof_double
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int=`cat conftest.val`
+
+
+ # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
+$as_echo_n "checking size of float... " >&6; }
+if ${ac_cv_sizeof_float+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then :
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+else
+ if test "$ac_cv_type_float" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+as_fn_error 77 "cannot compute sizeof (float)
+See \`config.log' for more details" "$LINENO" 5; }
else
- ac_cv_sizeof_int=0
+ ac_cv_sizeof_float=0
fi
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
+$as_echo "$ac_cv_sizeof_float" >&6; }
cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
+#define SIZEOF_FLOAT $ac_cv_sizeof_float
_ACEOF
+
+ # check for C99 types, headers and functions
+ ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_inttypes_h" = xyes; then :
+ dap_inttypes_header=yes
+fi
+
+
+ # DINT32 4
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int32_t" >&5
+$as_echo_n "checking size of int32_t... " >&6; }
+if ${ac_cv_sizeof_int32_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int32_t))" "ac_cv_sizeof_int32_t" "$ac_includes_default"; then :
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
+ if test "$ac_cv_type_int32_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (int32_t)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_int32_t=0
+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int32_t" >&5
+$as_echo "$ac_cv_sizeof_int32_t" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT32_T $ac_cv_sizeof_int32_t
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+ # DUINT32
+ # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint32_t" >&5
+$as_echo_n "checking size of uint32_t... " >&6; }
+if ${ac_cv_sizeof_uint32_t+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint32_t))" "ac_cv_sizeof_uint32_t" "$ac_includes_default"; then :
- ac_lo= ac_hi=
+else
+ if test "$ac_cv_type_uint32_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (uint32_t)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_uint32_t=0
+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint32_t" >&5
+$as_echo "$ac_cv_sizeof_uint32_t" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UINT32_T $ac_cv_sizeof_uint32_t
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ # DINT16 short
+ # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int16_t" >&5
+$as_echo_n "checking size of int16_t... " >&6; }
+if ${ac_cv_sizeof_int16_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int16_t))" "ac_cv_sizeof_int16_t" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_int16_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+as_fn_error 77 "cannot compute sizeof (int16_t)
+See \`config.log' for more details" "$LINENO" 5; }
else
- ac_cv_sizeof_long=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
+ ac_cv_sizeof_int16_t=0
+ fi
+fi
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (long))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (long))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (long))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int16_t" >&5
+$as_echo "$ac_cv_sizeof_int16_t" >&6; }
- ;
- return 0;
-}
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT16_T $ac_cv_sizeof_int16_t
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
+
+
+ # DUINT16 unsigned short
+ # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint16_t" >&5
+$as_echo_n "checking size of uint16_t... " >&6; }
+if ${ac_cv_sizeof_uint16_t+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint16_t))" "ac_cv_sizeof_uint16_t" "$ac_includes_default"; then :
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+else
+ if test "$ac_cv_type_uint16_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+as_fn_error 77 "cannot compute sizeof (uint16_t)
+See \`config.log' for more details" "$LINENO" 5; }
else
- ac_cv_sizeof_long=0
+ ac_cv_sizeof_uint16_t=0
fi
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint16_t" >&5
+$as_echo "$ac_cv_sizeof_uint16_t" >&6; }
cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
+#define SIZEOF_UINT16_T $ac_cv_sizeof_uint16_t
_ACEOF
+ # DBYTE 1
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of char" >&5
-$as_echo_n "checking size of char... " >&6; }
-if test "${ac_cv_sizeof_char+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint8_t" >&5
+$as_echo_n "checking size of uint8_t... " >&6; }
+if ${ac_cv_sizeof_uint8_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
-test_array [0] = 0
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint8_t))" "ac_cv_sizeof_uint8_t" "$ac_includes_default"; then :
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if test "$ac_cv_type_uint8_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (uint8_t)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_uint8_t=0
+ fi
+fi
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint8_t" >&5
+$as_echo "$ac_cv_sizeof_uint8_t" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UINT8_T $ac_cv_sizeof_uint8_t
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+ if test x"$dap_inttypes_header" = x'yes' -a $ac_cv_sizeof_int32_t -eq 4 -a $ac_cv_sizeof_int16_t -eq 2 -a $ac_cv_sizeof_uint8_t -eq 1 -a $ac_cv_sizeof_double -eq 8; then
+ dap_use_c99_types=yes
+ fi
+ if test x"$dap_use_c99_types" = 'xyes'; then
+ USE_C99_TYPES_TRUE=
+ USE_C99_TYPES_FALSE='#'
+else
+ USE_C99_TYPES_TRUE='#'
+ USE_C99_TYPES_FALSE=
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo= ac_hi=
-fi
+ # I've separated the typedefs from the config.h header because other
+ # projects which use the DAP were getting conflicts with their includes,
+ # or the includes of still other libraries, and config.h. The
+ # config.h header is now included only by .cc and .c files and headers
+ # that need the typedefs use dods-datatypes.h.
+ # there are 2 possibilities for the definition of dods_int32, ...,
+ # types. First possibility is that the C99 types are used and
+ # dods-datatypes-static.h is copied. In that case the following
+ # definitions are not really usefull. In case the C99 types are
+ # not available, dods-datatypes-config.h.in is used to generate
+ # dods-datatypes.h.
+ # The code below makes dods-datatypes-config.h stand on its own.
+ # 8/2/2000 jhrg
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+ # DMH: Divide into two sets of tests: one for DODS and one for XDR
+ if test x"$dap_use_c99_types" = 'xyes'; then
+ DODS_INT64=int64_t
+ DODS_UINT64=uint64_t
+ DODS_INT32=int32_t
+ DODS_UINT32=uint32_t
+ DODS_INT16=int16_t
+ DODS_UINT16=uint16_t
+ DODS_INT8=int8_t
+ DODS_BYTE=uint8_t
+ else
+ DODS_INT64="long long"
+ DODS_UINT64="unsigned long long"
+ DODS_INT16=short
+ DODS_UINT16="unsigned short"
+ DODS_INT32=int
+ DODS_UINT32="unsigned int"
+ DODS_INT8=char
+ DODS_BYTE="unsigned char"
+ fi
+ DODS_FLOAT64=double
+ DODS_FLOAT32=float
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+ # I'm using the three arg form of AC_DEFINE_UNQUOTED because autoheader
+ # needs the third argument (although I don't quite get the specifics...
+ # 2/15/2001 jhrg
+
+cat >>confdefs.h <<_ACEOF
+#define DINT64 $DODS_INT64
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define DUINT64 $DODS_UINT64
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_char=$ac_lo;;
-'') if test "$ac_cv_type_char" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_char=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define DINT32 $DODS_INT32
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (char)); }
-static unsigned long int ulongval () { return (long int) (sizeof (char)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (char))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (char))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (char))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
- ;
- return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define DUINT32 $DODS_UINT32
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_char=`cat conftest.val`
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-if test "$ac_cv_type_char" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_char=0
- fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-$as_echo "$ac_cv_sizeof_char" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define DINT16 $DODS_INT16
+_ACEOF
cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
+#define DUINT16 $DODS_UINT16
_ACEOF
- # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of double" >&5
-$as_echo_n "checking size of double... " >&6; }
-if test "${ac_cv_sizeof_double+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define DFLOAT64 $DODS_FLOAT64
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= 0)];
-test_array [0] = 0
- ;
- return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define DFLOAT32 $DODS_FLOAT32
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+
+
+cat >>confdefs.h <<_ACEOF
+#define DINT8 $DODS_INT8
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DBYTE $DODS_BYTE
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+
+ # XDR INTEGER TYPES
+ #
+ # Since DAP4 does not use XDR, there are no defines for the int8 or the
+ # 64-bit integer types used by DAP4. jhrg 6/26/12
+ #
+ # Unfortunately, there is little commonality about xdr
+
+ # First, we need to see if the xdr routines are in libc, librpc,
+ # or librpcsvc or libnsl
+ dap_xdrlib=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing xdr_void" >&5
+$as_echo_n "checking for library containing xdr_void... " >&6; }
+if ${ac_cv_search_xdr_void+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_void ();
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
-test_array [0] = 0
-
+return xdr_void ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+for ac_lib in '' c rpc nsl rpcsvc; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_xdr_void=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_xdr_void+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_xdr_void+:} false; then :
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
+else
+ ac_cv_search_xdr_void=no
fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_xdr_void" >&5
+$as_echo "$ac_cv_search_xdr_void" >&6; }
+ac_res=$ac_cv_search_xdr_void
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+ dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot locate library containing xdr functions." >&5
+$as_echo "$as_me: WARNING: Cannot locate library containing xdr functions." >&2;}
+fi
+
+ # Added for autoconf 2.59 which appears to not use/set $ac_res. jhrg
+ if test -z "$dap_xdrlib" ; then dap_xdrlib=c; fi
+ if test "$dap_xdrlib" = "none required" ; then dap_xdrlib=c; fi
+ # I don't think this is needed for autoconf 2.61 but I have no idea about
+ # 2.59 - it doesn't seem to be hurting anything with 2.61. jhrg
+ if test "$dap_xdrlib" != "c" ; then
+ # Add to library list
+ as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_void" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_void in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_void in -l$dap_xdrlib... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_void ();
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (double))) < 0)];
-test_array [0] = 0
-
+return xdr_void ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_LIB$dap_xdrlib" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+ LIBS="-l$dap_xdrlib $LIBS"
+
+fi
+
+ fi
+ # Now figure out what integer functions to use
+ dap_xdrint=0
+ as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_uint32_t" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_uint32_t in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_uint32_t in -l$dap_xdrlib... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_uint32_t ();
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= $ac_mid)];
-test_array [0] = 0
-
+return xdr_uint32_t ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
+ eval "$as_ac_Lib=no"
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ dap_xdrint=1
+else
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_u_int32_t" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_u_int32_t in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_u_int32_t in -l$dap_xdrlib... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_u_int32_t ();
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
-test_array [0] = 0
-
+return xdr_u_int32_t ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ dap_xdrint=2
+else
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_double=$ac_lo;;
-'') if test "$ac_cv_type_double" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (double)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_double=0
- fi ;;
-esac
+ as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_uint" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_uint in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_uint in -l$dap_xdrlib... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (double)); }
-static unsigned long int ulongval () { return (long int) (sizeof (double)); }
-#include <stdio.h>
-#include <stdlib.h>
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_uint ();
int
main ()
{
+return xdr_uint ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ dap_xdrint=3
+else
+
+ as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_u_int" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_u_int in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_u_int in -l$dap_xdrlib... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (double))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (double))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (double))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_u_int ();
+int
+main ()
+{
+return xdr_u_int ();
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_double=`cat conftest.val`
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ dap_xdrint=4
+fi
-( exit $ac_status )
-if test "$ac_cv_type_double" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (double)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_double=0
- fi
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+
fi
-rm -f conftest.val
+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
-$as_echo "$ac_cv_sizeof_double" >&6; }
+ case "$dap_xdrint" in
+ 1) # uint32_t
+ XDR_INT32=xdr_int32_t
+ XDR_UINT32=xdr_uint32_t
+ XDR_INT16=xdr_int16_t
+ XDR_UINT16=xdr_uint16_t
+ ;;
+ 2) # u_int32_t
+ XDR_INT32=xdr_int32_t
+ XDR_UINT32=xdr_u_int32_t
+ XDR_INT16=xdr_int16_t
+ XDR_UINT16=xdr_u_int16_t
+ ;;
+ 3) # uint
+ XDR_INT32=xdr_int
+ XDR_UINT32=xdr_uint
+ XDR_INT16=xdr_short
+ XDR_UINT16=xdr_ushort
+ ;;
+ 4) # u_int
+ XDR_INT32=xdr_int
+ XDR_UINT32=xdr_u_int
+ XDR_INT16=xdr_short
+ XDR_UINT16=xdr_u_short
+ ;;
+ *)
+ as_fn_error $? "Cannot determine DODS XDR integer sizes" "$LINENO" 5
+ ;;
+ esac
+ XDR_FLOAT64=xdr_double
+ XDR_FLOAT32=xdr_float
cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
+#define XDR_INT16 $XDR_INT16
_ACEOF
- # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of float" >&5
-$as_echo_n "checking size of float... " >&6; }
-if test "${ac_cv_sizeof_float+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define XDR_UINT16 $XDR_UINT16
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= 0)];
-test_array [0] = 0
- ;
- return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_INT32 $XDR_INT32
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_UINT32 $XDR_UINT32
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_FLOAT64 $XDR_FLOAT64
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_FLOAT32 $XDR_FLOAT32
+_ACEOF
+
+
+# Check whether --enable-runtime-endian-check was given.
+if test "${enable_runtime_endian_check+set}" = set; then :
+ enableval=$enable_runtime_endian_check;
+fi
+
+
+if test "x$enable_runtime_endian_check" = "xyes"; then :
+
+
+$as_echo "#define COMPUTE_ENDIAN_AT_RUNTIME 1" >>confdefs.h
+
+
+fi
+
+# Checks for library functions.
+
+for ac_func in alarm atexit bzero dup2 getcwd getpagesize localtime_r memmove memset pow putenv setenv strchr strerror strtol strtoul timegm mktime
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+fi
+done
+
+
+
+
+
+
+
+
+
+
+
+ LIBC_FATAL_STDERR_=1
+ export LIBC_FATAL_STDERR_
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments. Useless!
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+#include <alloca.h>
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)];
-test_array [0] = 0
-
+char *p = (char *) alloca (2 * sizeof (int));
+ if (p) return 0;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_working_alloca_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_working_alloca_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
+# else
+# ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca (size_t);
+# endif
+# endif
+# endif
+# endif
+#endif
+
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (float))) < 0)];
-test_array [0] = 0
-
+char *p = (char *) alloca (1);
+ if (p) return 0;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_alloca_works=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
+ ac_cv_func_alloca_works=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if test $ac_cv_func_alloca_works = yes; then
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_float=$ac_lo;;
-'') if test "$ac_cv_type_float" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (float)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_float=0
- fi ;;
-esac
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (float)); }
-static unsigned long int ulongval () { return (long int) (sizeof (float)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (float))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (float))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (float))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble. Some versions do not even contain alloca or
+# contain a buggy version. If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_float=`cat conftest.val`
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-if test "$ac_cv_type_float" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (float)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_float=0
- fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
-$as_echo "$ac_cv_sizeof_float" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FLOAT $ac_cv_sizeof_float
-_ACEOF
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
- # check for C99 types, headers and functions
- if test "${ac_cv_header_inttypes_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5
-$as_echo_n "checking for inttypes.h... " >&6; }
-if test "${ac_cv_header_inttypes_h+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
$as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5
-$as_echo "$ac_cv_header_inttypes_h" >&6; }
else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking inttypes.h usability" >&5
-$as_echo_n "checking inttypes.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-#include <inttypes.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking inttypes.h presence" >&5
-$as_echo_n "checking inttypes.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <inttypes.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "webecray" >/dev/null 2>&1; then :
+ ac_cv_os_cray=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_os_cray=no
+fi
+rm -f conftest*
- ac_header_preproc=no
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: inttypes.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5
-$as_echo_n "checking for inttypes.h... " >&6; }
-if test "${ac_cv_header_inttypes_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_inttypes_h=$ac_header_preproc
+ break
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5
-$as_echo "$ac_cv_header_inttypes_h" >&6; }
+ done
fi
-if test "x$ac_cv_header_inttypes_h" = x""yes; then
- dap_inttypes_header=yes
-fi
-
- # DINT32 4
- # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of int32_t" >&5
-$as_echo_n "checking size of int32_t... " >&6; }
-if test "${ac_cv_sizeof_int32_t+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test "$cross_compiling" = yes; then :
+ ac_cv_c_stack_direction=0
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
-main ()
+find_stack_direction (int *addr, int depth)
{
-static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
+ int dir, dummy = 0;
+ if (! addr)
+ addr = &dummy;
+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+ dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+ return dir + dummy;
}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
+
int
-main ()
+main (int argc, char **argv)
{
-static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
+ return find_stack_direction (0, argc + !argv + 20) < 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_c_stack_direction=1
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_c_stack_direction=-1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+fi
+
+
+ GNULIB_BTOWC=0;
+ GNULIB_WCTOB=0;
+ GNULIB_MBSINIT=0;
+ GNULIB_MBRTOWC=0;
+ GNULIB_MBRLEN=0;
+ GNULIB_MBSRTOWCS=0;
+ GNULIB_MBSNRTOWCS=0;
+ GNULIB_WCRTOMB=0;
+ GNULIB_WCSRTOMBS=0;
+ GNULIB_WCSNRTOMBS=0;
+ GNULIB_WCWIDTH=0;
+ GNULIB_WMEMCHR=0;
+ GNULIB_WMEMCMP=0;
+ GNULIB_WMEMCPY=0;
+ GNULIB_WMEMMOVE=0;
+ GNULIB_WMEMSET=0;
+ GNULIB_WCSLEN=0;
+ GNULIB_WCSNLEN=0;
+ GNULIB_WCSCPY=0;
+ GNULIB_WCPCPY=0;
+ GNULIB_WCSNCPY=0;
+ GNULIB_WCPNCPY=0;
+ GNULIB_WCSCAT=0;
+ GNULIB_WCSNCAT=0;
+ GNULIB_WCSCMP=0;
+ GNULIB_WCSNCMP=0;
+ GNULIB_WCSCASECMP=0;
+ GNULIB_WCSNCASECMP=0;
+ GNULIB_WCSCOLL=0;
+ GNULIB_WCSXFRM=0;
+ GNULIB_WCSDUP=0;
+ GNULIB_WCSCHR=0;
+ GNULIB_WCSRCHR=0;
+ GNULIB_WCSCSPN=0;
+ GNULIB_WCSSPN=0;
+ GNULIB_WCSPBRK=0;
+ GNULIB_WCSSTR=0;
+ GNULIB_WCSTOK=0;
+ GNULIB_WCSWIDTH=0;
+ HAVE_BTOWC=1;
+ HAVE_MBSINIT=1;
+ HAVE_MBRTOWC=1;
+ HAVE_MBRLEN=1;
+ HAVE_MBSRTOWCS=1;
+ HAVE_MBSNRTOWCS=1;
+ HAVE_WCRTOMB=1;
+ HAVE_WCSRTOMBS=1;
+ HAVE_WCSNRTOMBS=1;
+ HAVE_WMEMCHR=1;
+ HAVE_WMEMCMP=1;
+ HAVE_WMEMCPY=1;
+ HAVE_WMEMMOVE=1;
+ HAVE_WMEMSET=1;
+ HAVE_WCSLEN=1;
+ HAVE_WCSNLEN=1;
+ HAVE_WCSCPY=1;
+ HAVE_WCPCPY=1;
+ HAVE_WCSNCPY=1;
+ HAVE_WCPNCPY=1;
+ HAVE_WCSCAT=1;
+ HAVE_WCSNCAT=1;
+ HAVE_WCSCMP=1;
+ HAVE_WCSNCMP=1;
+ HAVE_WCSCASECMP=1;
+ HAVE_WCSNCASECMP=1;
+ HAVE_WCSCOLL=1;
+ HAVE_WCSXFRM=1;
+ HAVE_WCSDUP=1;
+ HAVE_WCSCHR=1;
+ HAVE_WCSRCHR=1;
+ HAVE_WCSCSPN=1;
+ HAVE_WCSSPN=1;
+ HAVE_WCSPBRK=1;
+ HAVE_WCSSTR=1;
+ HAVE_WCSTOK=1;
+ HAVE_WCSWIDTH=1;
+ HAVE_DECL_WCTOB=1;
+ HAVE_DECL_WCWIDTH=1;
+ REPLACE_MBSTATE_T=0;
+ REPLACE_BTOWC=0;
+ REPLACE_WCTOB=0;
+ REPLACE_MBSINIT=0;
+ REPLACE_MBRTOWC=0;
+ REPLACE_MBRLEN=0;
+ REPLACE_MBSRTOWCS=0;
+ REPLACE_MBSNRTOWCS=0;
+ REPLACE_WCRTOMB=0;
+ REPLACE_WCSRTOMBS=0;
+ REPLACE_WCSNRTOMBS=0;
+ REPLACE_WCWIDTH=0;
+ REPLACE_WCSWIDTH=0;
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+$as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
+if ${gl_cv_header_wchar_h_correct_inline+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gl_cv_header_wchar_h_correct_inline=yes
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) < 0)];
-test_array [0] = 0
- ;
- return 0;
-}
+ #define wcstod renamed_wcstod
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+ <wchar.h>.
+ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+ included before <wchar.h>. */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+extern int zero (void);
+int main () { return zero(); }
+
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ mv conftest.$ac_objext conftest1.$ac_objext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) >= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
+ #define wcstod renamed_wcstod
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+ <wchar.h>.
+ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+ included before <wchar.h>. */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+int zero (void) { return 0; }
+
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ mv conftest.$ac_objext conftest2.$ac_objext
+ if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
+ :
+ else
+ gl_cv_header_wchar_h_correct_inline=no
+ fi
+ fi
+ fi
+ rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
+$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
+ if test $gl_cv_header_wchar_h_correct_inline = no; then
+ as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
+C99 mode. You have four options:
+ - Add the flag -fgnu89-inline to CC and reconfigure, or
+ - Fix your include files, using parts of
+ <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
+ - Use a gcc version older than 4.3, or
+ - Don't use the flags -std=c99 or -std=gnu99.
+Configuration aborted." "$LINENO" 5
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+ for ac_func in $ac_func_list
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+fi
+done
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if ${am_cv_langinfo_codeset+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+#include <langinfo.h>
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= $ac_mid)];
-test_array [0] = 0
-
+char* cs = nl_langinfo(CODESET); return !cs;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_langinfo_codeset=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ am_cv_langinfo_codeset=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
+ if test $am_cv_langinfo_codeset = yes; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int32_t=$ac_lo;;
-'') if test "$ac_cv_type_int32_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int32_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int32_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_int32_t=0
- fi ;;
-esac
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+
+ fi
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+$as_echo_n "checking for a traditional french locale... " >&6; }
+if ${gt_cv_locale_fr+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (int32_t)); }
-static unsigned long int ulongval () { return (long int) (sizeof (int32_t)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main () {
+ /* Check whether the given locale name is recognized by the system. */
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+ /* On native Windows, setlocale(category, "") looks at the system settings,
+ not at the environment variables. Also, when an encoding suffix such
+ as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+ category of the locale to "C". */
+ if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+ || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
return 1;
- if (((long int) (sizeof (int32_t))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (int32_t))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (int32_t))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
+#else
+ if (setlocale (LC_ALL, "") == NULL) return 1;
+#endif
+ /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+ On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+ succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+ some unit tests fail.
+ On MirBSD 10, when an unsupported locale is specified, setlocale()
+ succeeds but then nl_langinfo(CODESET) is "UTF-8". */
+#if HAVE_LANGINFO_CODESET
+ {
+ const char *cs = nl_langinfo (CODESET);
+ if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
+ || strcmp (cs, "UTF-8") == 0)
+ return 1;
+ }
+#endif
+#ifdef __CYGWIN__
+ /* On Cygwin, avoid locale names without encoding suffix, because the
+ locale_charset() function relies on the encoding suffix. Note that
+ LC_ALL is set on the command line. */
+ if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+ /* Check whether in the abbreviation of the second month, the second
+ character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
+ one byte long. This excludes the UTF-8 encoding. */
+ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+ if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */
+ /* Check whether the decimal separator is a comma.
+ On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+ are nl_langinfo(RADIXCHAR) are both ".". */
+ if (localeconv () ->decimal_point[0] != ',') return 1;
+#endif
return 0;
}
+
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+ (eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int32_t=`cat conftest.val`
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
+ case "$host_os" in
+ # Handle native Windows specially, because there setlocale() interprets
+ # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+ # "fr" or "fra" as "French" or "French_France.1252",
+ # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+ # "ja" as "Japanese" or "Japanese_Japan.932",
+ # and similar.
+ mingw*)
+ # Test for the native Windows locale name.
+ if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr=French_France.1252
+ else
+ # None found.
+ gt_cv_locale_fr=none
+ fi
+ ;;
+ *)
+ # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+ # configure script would override the LC_ALL setting. Likewise for
+ # LC_CTYPE, which is also set at the beginning of the configure script.
+ # Test for the usual locale name.
+ if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr=fr_FR
+ else
+ # Test for the locale name with explicit encoding suffix.
+ if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr=fr_FR.ISO-8859-1
+ else
+ # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+ if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr=fr_FR.ISO8859-1
+ else
+ # Test for the HP-UX locale name.
+ if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr=fr_FR.iso88591
+ else
+ # Test for the Solaris 7 locale name.
+ if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr=fr
+ else
+ # None found.
+ gt_cv_locale_fr=none
+ fi
+ fi
+ fi
+ fi
+ fi
+ ;;
+ esac
+ fi
+ rm -fr conftest*
-( exit $ac_status )
-if test "$ac_cv_type_int32_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int32_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int32_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_int32_t=0
- fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int32_t" >&5
-$as_echo "$ac_cv_sizeof_int32_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
+$as_echo "$gt_cv_locale_fr" >&6; }
+ LOCALE_FR=$gt_cv_locale_fr
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT32_T $ac_cv_sizeof_int32_t
-_ACEOF
- # DUINT32
- # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of uint32_t" >&5
-$as_echo_n "checking size of uint32_t... " >&6; }
-if test "${ac_cv_sizeof_uint32_t+set}" = set; then
+
+ GNULIB_NL_LANGINFO=0;
+ HAVE_NL_LANGINFO=1;
+ REPLACE_NL_LANGINFO=0;
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
+if ${gl_cv_have_include_next+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ rm -rf conftestd1a conftestd1b conftestd2
+ mkdir conftestd1a conftestd1b conftestd2
+ cat <<EOF > conftestd1a/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+ cat <<EOF > conftestd1b/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include <stdio.h>
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+ cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+ gl_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+#include <conftest.h>
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_have_include_next=yes
+else
+ CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
+#include <conftest.h>
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_have_include_next=buggy
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
+ gl_cv_have_include_next=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ CPPFLAGS="$gl_save_CPPFLAGS"
+ rm -rf conftestd1a conftestd1b conftestd2
- ac_lo= ac_hi=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
+$as_echo "$gl_cv_have_include_next" >&6; }
+ PRAGMA_SYSTEM_HEADER=
+ if test $gl_cv_have_include_next = yes; then
+ INCLUDE_NEXT=include_next
+ INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+ if test -n "$GCC"; then
+ PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
+ fi
+ else
+ if test $gl_cv_have_include_next = buggy; then
+ INCLUDE_NEXT=include
+ INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+ else
+ INCLUDE_NEXT=include
+ INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
+ fi
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
+$as_echo_n "checking whether system header files limit the line length... " >&6; }
+if ${gl_cv_pragma_columns+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) <= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
+#ifdef __TANDEM
+choke me
+#endif
+
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "choke me" >/dev/null 2>&1; then :
+ gl_cv_pragma_columns=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
+ gl_cv_pragma_columns=no
fi
+rm -f conftest*
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_uint32_t=$ac_lo;;
-'') if test "$ac_cv_type_uint32_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint32_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (uint32_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_uint32_t=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (uint32_t)); }
-static unsigned long int ulongval () { return (long int) (sizeof (uint32_t)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (uint32_t))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (uint32_t))))
- return 1;
- fprintf (f, "%ld", i);
- }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5
+$as_echo "$gl_cv_pragma_columns" >&6; }
+ if test $gl_cv_pragma_columns = yes; then
+ PRAGMA_COLUMNS="#pragma COLUMNS 10000"
else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (uint32_t))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+ PRAGMA_COLUMNS=
+ fi
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_uint32_t=`cat conftest.val`
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-if test "$ac_cv_type_uint32_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint32_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (uint32_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_uint32_t=0
- fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint32_t" >&5
-$as_echo "$ac_cv_sizeof_uint32_t" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT32_T $ac_cv_sizeof_uint32_t
-_ACEOF
- # DINT16 short
- # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of int16_t" >&5
-$as_echo_n "checking size of int16_t... " >&6; }
-if test "${ac_cv_sizeof_int16_t+set}" = set; then
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+$as_echo_n "checking for working fcntl.h... " >&6; }
+if ${gl_cv_header_working_fcntl_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test "$cross_compiling" = yes; then :
+ gl_cv_header_working_fcntl_h=cross-compiling
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) >= 0)];
-test_array [0] = 0
+#include <sys/types.h>
+ #include <sys/stat.h>
+ #if HAVE_UNISTD_H
+ # include <unistd.h>
+ #else /* on Windows with MSVC */
+ # include <io.h>
+ # include <stdlib.h>
+ # defined sleep(n) _sleep ((n) * 1000)
+ #endif
+ #include <fcntl.h>
+ #ifndef O_NOATIME
+ #define O_NOATIME 0
+ #endif
+ #ifndef O_NOFOLLOW
+ #define O_NOFOLLOW 0
+ #endif
+ static int const constants[] =
+ {
+ O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
+ O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
+ };
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) <= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
+ int result = !constants;
+ #if HAVE_SYMLINK
+ {
+ static char const sym[] = "conftest.sym";
+ if (symlink ("/dev/null", sym) != 0)
+ result |= 2;
+ else
+ {
+ int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
+ if (fd >= 0)
+ {
+ close (fd);
+ result |= 4;
+ }
+ }
+ if (unlink (sym) != 0 || symlink (".", sym) != 0)
+ result |= 2;
+ else
+ {
+ int fd = open (sym, O_RDONLY | O_NOFOLLOW);
+ if (fd >= 0)
+ {
+ close (fd);
+ result |= 4;
+ }
+ }
+ unlink (sym);
+ }
+ #endif
+ {
+ static char const file[] = "confdefs.h";
+ int fd = open (file, O_RDONLY | O_NOATIME);
+ if (fd < 0)
+ result |= 8;
+ else
+ {
+ struct stat st0;
+ if (fstat (fd, &st0) != 0)
+ result |= 16;
+ else
+ {
+ char c;
+ sleep (1);
+ if (read (fd, &c, 1) != 1)
+ result |= 24;
+ else
+ {
+ if (close (fd) != 0)
+ result |= 32;
+ else
+ {
+ struct stat st1;
+ if (stat (file, &st1) != 0)
+ result |= 40;
+ else
+ if (st0.st_atime != st1.st_atime)
+ result |= 64;
+ }
+ }
+ }
+ }
+ }
+ return result;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ gl_cv_header_working_fcntl_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ case $? in #(
+ 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+ 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
+ 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+ *) gl_cv_header_working_fcntl_h='no';;
+ esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+ case $gl_cv_header_working_fcntl_h in #(
+ *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
+ *) ac_val=1;;
+ esac
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WORKING_O_NOATIME $ac_val
+_ACEOF
+
+
+ case $gl_cv_header_working_fcntl_h in #(
+ *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
+ *) ac_val=1;;
+ esac
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WORKING_O_NOFOLLOW $ac_val
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
+ ac_have_decl=1
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_have_decl=0
+fi
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
+$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
+if ${ac_cv_gnu_library_2_1+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) < 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+ Lucky GNU user
+ #endif
+#endif
+#ifdef __UCLIBC__
+ Lucky user
+#endif
+
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "Lucky" >/dev/null 2>&1; then :
+ ac_cv_gnu_library_2_1=yes
+else
+ ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
+
+ GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+
+ GNULIB_LOCALECONV=0;
+ GNULIB_SETLOCALE=0;
+ GNULIB_DUPLOCALE=0;
+ HAVE_DUPLOCALE=1;
+ REPLACE_LOCALECONV=0;
+ REPLACE_SETLOCALE=0;
+ REPLACE_DUPLOCALE=0;
+ REPLACE_STRUCT_LCONV=0;
+
+
+ REPLACE_NULL=0;
+ HAVE_MAX_ALIGN_T=1;
+ HAVE_WCHAR_T=1;
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+$as_echo_n "checking for wchar_t... " >&6; }
+if ${gt_cv_c_wchar_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+#include <stddef.h>
+ wchar_t foo = (wchar_t)'\0';
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) >= $ac_mid)];
-test_array [0] = 0
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
+if ac_fn_c_try_compile "$LINENO"; then :
+ gt_cv_c_wchar_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+ gt_cv_c_wchar_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+$as_echo "$gt_cv_c_wchar_t" >&6; }
+ if test $gt_cv_c_wchar_t = yes; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
+
+ fi
+
+
+
+
+ STDDEF_H=
+ ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include <stddef.h>
+
+"
+if test "x$ac_cv_type_max_align_t" = xyes; then :
+
+else
+ HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test $gt_cv_c_wchar_t = no; then
+ HAVE_WCHAR_T=0
+ STDDEF_H=stddef.h
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
+if ${gl_cv_decl_null_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+#include <stddef.h>
+ int test[2 * (sizeof NULL == sizeof (void *)) -1];
+
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) <= $ac_mid)];
-test_array [0] = 0
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_decl_null_works=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
+ gl_cv_decl_null_works=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int16_t=$ac_lo;;
-'') if test "$ac_cv_type_int16_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int16_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int16_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_int16_t=0
- fi ;;
-esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+$as_echo "$gl_cv_decl_null_works" >&6; }
+ if test $gl_cv_decl_null_works = no; then
+ REPLACE_NULL=1
+ STDDEF_H=stddef.h
+ fi
+
+ if test -n "$STDDEF_H"; then
+ GL_GENERATE_STDDEF_H_TRUE=
+ GL_GENERATE_STDDEF_H_FALSE='#'
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (int16_t)); }
-static unsigned long int ulongval () { return (long int) (sizeof (int16_t)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
+ GL_GENERATE_STDDEF_H_TRUE='#'
+ GL_GENERATE_STDDEF_H_FALSE=
+fi
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (int16_t))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (int16_t))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (int16_t))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+ if test -n "$STDDEF_H"; then
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int16_t=`cat conftest.val`
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-if test "$ac_cv_type_int16_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int16_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int16_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_int16_t=0
- fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int16_t" >&5
-$as_echo "$ac_cv_sizeof_int16_t" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT16_T $ac_cv_sizeof_int16_t
-_ACEOF
- # DUINT16 unsigned short
- # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of uint16_t" >&5
-$as_echo_n "checking size of uint16_t... " >&6; }
-if test "${ac_cv_sizeof_uint16_t+set}" = set; then
+
+ if test $gl_cv_have_include_next = yes; then
+ gl_cv_next_stddef_h='<'stddef.h'>'
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
+if ${gl_cv_next_stddef_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) >= 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) <= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stddef.h>
+_ACEOF
+ case "$host_os" in
+ aix*) gl_absname_cpp="$ac_cpp -C" ;;
+ *) gl_absname_cpp="$ac_cpp" ;;
+ esac
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ case "$host_os" in
+ mingw*)
+ gl_dirsep_regex='[/\\]'
+ ;;
+ *)
+ gl_dirsep_regex='\/'
+ ;;
+ esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+ gl_header_literal_regex=`echo 'stddef.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
+ p
+ q
+ }'
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) < 0)];
-test_array [0] = 0
+ gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+ sed -n "$gl_absolute_header_sed"`
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) >= $ac_mid)];
-test_array [0] = 0
+ gl_header=$gl_cv_absolute_stddef_h
+ gl_cv_next_stddef_h='"'$gl_header'"'
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+$as_echo "$gl_cv_next_stddef_h" >&6; }
+ fi
+ NEXT_STDDEF_H=$gl_cv_next_stddef_h
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+ gl_next_as_first_directive='<'stddef.h'>'
+ else
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+ gl_next_as_first_directive=$gl_cv_next_stddef_h
+ fi
+ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) <= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ fi
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_uint16_t=$ac_lo;;
-'') if test "$ac_cv_type_uint16_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint16_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (uint16_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_uint16_t=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (uint16_t)); }
-static unsigned long int ulongval () { return (long int) (sizeof (uint16_t)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (uint16_t))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (uint16_t))))
- return 1;
- fprintf (f, "%ld", i);
- }
+
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (uint16_t))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_uint16_t=`cat conftest.val`
+
+
+# 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
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ with_gnu_ld=no
+fi
-( exit $ac_status )
-if test "$ac_cv_type_uint16_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint16_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (uint16_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_uint16_t=0
- fi
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ 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
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+
+ac_prog=ld
+if test "$GCC" = yes; 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
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | ?:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+ 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"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${acl_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$LD"; then
+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$acl_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_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 `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
fi
-rm -f conftest.val
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint16_t" >&5
-$as_echo "$ac_cv_sizeof_uint16_t" >&6; }
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${acl_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes
+ ;;
+*)
+ acl_cv_prog_gnu_ld=no
+ ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT16_T $ac_cv_sizeof_uint16_t
-_ACEOF
- # DBYTE 1
- # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of uint8_t" >&5
-$as_echo_n "checking size of uint8_t... " >&6; }
-if test "${ac_cv_sizeof_uint8_t+set}" = set; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if ${acl_cv_rpath+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) >= 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) <= $ac_mid)];
-test_array [0] = 0
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+ wl="$acl_cv_wl"
+ acl_libext="$acl_cv_libext"
+ acl_shlibext="$acl_cv_shlibext"
+ acl_libname_spec="$acl_cv_libname_spec"
+ acl_library_names_spec="$acl_cv_library_names_spec"
+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ acl_hardcode_direct="$acl_cv_hardcode_direct"
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+ enableval=$enable_rpath; :
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
+ enable_rpath=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) < 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+
+ acl_libdirstem=lib
+ acl_libdirstem2=
+ case "$host_os" in
+ solaris*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if ${gl_cv_solaris_64bit+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+ gl_cv_solaris_64bit=yes
+else
+ gl_cv_solaris_64bit=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+ if test $gl_cv_solaris_64bit = yes; then
+ acl_libdirstem=lib/64
+ case "$host_cpu" in
+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi
+ ;;
+ *)
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+ ;;
+ esac
+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+ gl_threads_api=none
+ LIBTHREAD=
+ LTLIBTHREAD=
+ LIBMULTITHREAD=
+ LTLIBMULTITHREAD=
+ if test "$gl_use_threads" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
+$as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
+if ${gl_cv_have_weak+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gl_cv_have_weak=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+extern void xyzzy ();
+#pragma weak xyzzy
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) >= $ac_mid)];
-test_array [0] = 0
-
+xyzzy();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
+ gl_cv_have_weak=maybe
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $gl_cv_have_weak = maybe; then
+ if test "$cross_compiling" = yes; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __ELF__
+ Extensible Linking Format
+ #endif
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "Extensible Linking Format" >/dev/null 2>&1; then :
+ gl_cv_have_weak="guessing yes"
+else
+ gl_cv_have_weak="guessing no"
fi
+rm -f conftest*
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- ac_lo= ac_hi=
+#include <stdio.h>
+#pragma weak fputs
+int main ()
+{
+ return (fputs == NULL);
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ gl_cv_have_weak=yes
+else
+ gl_cv_have_weak=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
+$as_echo "$gl_cv_have_weak" >&6; }
+ if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+ # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
+ # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
+ ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
+ gl_have_pthread_h=yes
+else
+ gl_have_pthread_h=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+ if test "$gl_have_pthread_h" = yes; then
+ # Other possible tests:
+ # -lpthreads (FSU threads, PCthreads)
+ # -lgthreads
+ gl_have_pthread=
+ # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
+ # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
+ # the second one only in libpthread, and lock.c needs it.
+ #
+ # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
+ # needs -pthread for some reason. See:
+ # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
+ save_LIBS=$LIBS
+ for gl_pthread in '' '-pthread'; do
+ LIBS="$LIBS $gl_pthread"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
+#include <pthread.h>
+ pthread_mutex_t m;
+ pthread_mutexattr_t ma;
+
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) <= $ac_mid)];
-test_array [0] = 0
-
+pthread_mutex_lock (&m);
+ pthread_mutexattr_init (&ma);
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
+if ac_fn_c_try_link "$LINENO"; then :
+ gl_have_pthread=yes
+ LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
+ LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread
fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$save_LIBS
+ test -n "$gl_have_pthread" && break
+ done
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_uint8_t=$ac_lo;;
-'') if test "$ac_cv_type_uint8_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint8_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (uint8_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_uint8_t=0
- fi ;;
-esac
+ # Test for libpthread by looking for pthread_kill. (Not pthread_self,
+ # since it is defined as a macro on OSF/1.)
+ if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
+ # The program links fine without libpthread. But it may actually
+ # need to link with libpthread in order to create multiple threads.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (uint8_t)); }
-static unsigned long int ulongval () { return (long int) (sizeof (uint8_t)); }
-#include <stdio.h>
-#include <stdlib.h>
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill ();
int
main ()
{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (uint8_t))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (uint8_t))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (uint8_t))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
+return pthread_kill ();
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_uint8_t=`cat conftest.val`
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pthread_pthread_kill=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_uint8_t" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint8_t)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (uint8_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
- else
- ac_cv_sizeof_uint8_t=0
- fi
+ ac_cv_lib_pthread_pthread_kill=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint8_t" >&5
-$as_echo "$ac_cv_sizeof_uint8_t" >&6; }
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+ LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+ # On Solaris and HP-UX, most pthread functions exist also in libc.
+ # Therefore pthread_in_use() needs to actually try to create a
+ # thread: pthread_create from libc will fail, whereas
+ # pthread_create will actually create a thread.
+ case "$host_os" in
+ solaris* | hpux*)
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT8_T $ac_cv_sizeof_uint8_t
-_ACEOF
+$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
+ esac
- if test x"$dap_inttypes_header" = x'yes' -a $ac_cv_sizeof_int32_t -eq 4 -a $ac_cv_sizeof_int16_t -eq 2 -a $ac_cv_sizeof_uint8_t -eq 1 -a $ac_cv_sizeof_double -eq 8; then
- dap_use_c99_types=yes
- fi
- if test x"$dap_use_c99_types" = 'xyes'; then
- USE_C99_TYPES_TRUE=
- USE_C99_TYPES_FALSE='#'
-else
- USE_C99_TYPES_TRUE='#'
- USE_C99_TYPES_FALSE=
fi
-
- # I've separated the typedefs from the config.h header because other
- # projects which use the DAP were getting conflicts with their includes,
- # or the includes of still other libraries, and config.h. The
- # config.h header is now included only by .cc and .c files and headers
- # that need the typedefs use dods-datatypes.h.
- # there are 2 possibilities for the definition of dods_int32, ...,
- # types. First possibility is that the C99 types are used and
- # dods-datatypes-static.h is copied. In that case the following
- # definitions are not really usefull. In case the C99 types are
- # not available, dods-datatypes-config.h.in is used to generate
- # dods-datatypes.h.
- # The code below makes dods-datatypes-config.h stand on its own.
- # 8/2/2000 jhrg
-
- # DMH: Divide into two sets of tests: one for DODS and one for XDR
- if test x"$dap_use_c99_types" = 'xyes'; then
- DODS_INT64=int64_t
- DODS_UINT64=uint64_t
- DODS_INT32=int32_t
- DODS_UINT32=uint32_t
- DODS_INT16=int16_t
- DODS_UINT16=uint16_t
- DODS_INT8=int8_t
- DODS_BYTE=uint8_t
- else
- DODS_INT64="long long"
- DODS_UINT64="unsigned long long"
- DODS_INT16=short
- DODS_UINT16="unsigned short"
- DODS_INT32=int
- DODS_UINT32="unsigned int"
- DODS_INT8=char
- DODS_BYTE="unsigned char"
- fi
- DODS_FLOAT64=double
- DODS_FLOAT32=float
-
- # I'm using the three arg form of AC_DEFINE_UNQUOTED because autoheader
- # needs the third argument (although I don't quite get the specifics...
- # 2/15/2001 jhrg
-
-cat >>confdefs.h <<_ACEOF
-#define DINT64 $DODS_INT64
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DUINT64 $DODS_UINT64
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DINT32 $DODS_INT32
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DUINT32 $DODS_UINT32
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DINT16 $DODS_INT16
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DUINT16 $DODS_UINT16
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DFLOAT64 $DODS_FLOAT64
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DFLOAT32 $DODS_FLOAT32
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DINT8 $DODS_INT8
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DBYTE $DODS_BYTE
-_ACEOF
-
-
- # XDR INTEGER TYPES
- #
- # Since DAP4 does not use XDR, there are no defines for the int8 or the
- # 64-bit integer types used by DAP4. jhrg 6/26/12
- #
- # Unfortunately, there is little commonality about xdr
-
- # First, we need to see if the xdr routines are in libc, librpc,
- # or librpcsvc or libnsl
- dap_xdrlib=
- { $as_echo "$as_me:$LINENO: checking for library containing xdr_void" >&5
-$as_echo_n "checking for library containing xdr_void... " >&6; }
-if test "${ac_cv_search_xdr_void+set}" = set; then
+ elif test -z "$gl_have_pthread"; then
+ # Some library is needed. Try libpthread and libc_r.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -23111,100 +20110,42 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char xdr_void ();
+char pthread_kill ();
int
main ()
{
-return xdr_void ();
+return pthread_kill ();
;
return 0;
}
_ACEOF
-for ac_lib in '' c rpc nsl rpcsvc; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_search_xdr_void=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_xdr_void+set}" = set; then
- break
-fi
-done
-if test "${ac_cv_search_xdr_void+set}" = set; then
- :
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pthread_pthread_kill=yes
else
- ac_cv_search_xdr_void=no
+ ac_cv_lib_pthread_pthread_kill=no
fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_xdr_void" >&5
-$as_echo "$ac_cv_search_xdr_void" >&6; }
-ac_res=$ac_cv_search_xdr_void
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`
-else
-
- { $as_echo "$as_me:$LINENO: WARNING: Cannot locate library containing xdr functions." >&5
-$as_echo "$as_me: WARNING: Cannot locate library containing xdr functions." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+ gl_have_pthread=yes
+ LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+ LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
fi
- # Added for autoconf 2.59 which appears to not use/set $ac_res. jhrg
- if test -z "$dap_xdrlib" ; then dap_xdrlib=c; fi
- if test "$dap_xdrlib" = "none required" ; then dap_xdrlib=c; fi
- # I don't think this is needed for autoconf 2.61 but I have no idea about
- # 2.59 - it doesn't seem to be hurting anything with 2.61. jhrg
- if test "$dap_xdrlib" != "c" ; then
- # Add to library list
-
-as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_void" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for xdr_void in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_void in -l$dap_xdrlib... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ if test -z "$gl_have_pthread"; then
+ # For FreeBSD 4.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
+$as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
+if ${ac_cv_lib_c_r_pthread_kill+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lc_r $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -23213,5268 +20154,674 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char xdr_void ();
+char pthread_kill ();
int
main ()
{
-return xdr_void ();
+return pthread_kill ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_c_r_pthread_kill=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
+ ac_cv_lib_c_r_pthread_kill=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_LIB$dap_xdrlib" | $as_tr_cpp` 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
+$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
+if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then :
+ gl_have_pthread=yes
+ LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+ LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
+fi
- LIBS="-l$dap_xdrlib $LIBS"
+ fi
+ fi
+ if test -n "$gl_have_pthread"; then
+ gl_threads_api=posix
-fi
+$as_echo "#define USE_POSIX_THREADS 1" >>confdefs.h
- fi
- # Now figure out what integer functions to use
- dap_xdrint=0
- as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_uint32_t" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for xdr_uint32_t in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_uint32_t in -l$dap_xdrlib... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+ if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_uint32_t ();
-int
-main ()
-{
-return xdr_uint32_t ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- dap_xdrint=1
-else
+$as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
- as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_u_int32_t" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for xdr_u_int32_t in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_u_int32_t in -l$dap_xdrlib... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ LIBTHREAD=
+ LTLIBTHREAD=
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -z "$gl_have_pthread"; then
+ if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
+ gl_have_solaristhread=
+ gl_save_LIBS="$LIBS"
+ LIBS="$LIBS -lthread"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_u_int32_t ();
+#include <thread.h>
+#include <synch.h>
+
int
main ()
{
-return xdr_u_int32_t ();
+thr_self();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
+if ac_fn_c_try_link "$LINENO"; then :
+ gl_have_solaristhread=yes
fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gl_save_LIBS"
+ if test -n "$gl_have_solaristhread"; then
+ gl_threads_api=solaris
+ LIBTHREAD=-lthread
+ LTLIBTHREAD=-lthread
+ LIBMULTITHREAD="$LIBTHREAD"
+ LTLIBMULTITHREAD="$LTLIBTHREAD"
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- dap_xdrint=2
-else
+$as_echo "#define USE_SOLARIS_THREADS 1" >>confdefs.h
- as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_uint" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for xdr_uint in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_uint in -l$dap_xdrlib... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_uint ();
-int
-main ()
-{
-return xdr_uint ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h
- eval "$as_ac_Lib=no"
-fi
+ LIBTHREAD=
+ LTLIBTHREAD=
+ fi
+ fi
+ fi
+ fi
+ if test "$gl_use_threads" = pth; then
+ gl_save_CPPFLAGS="$CPPFLAGS"
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- dap_xdrint=3
-else
- as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_u_int" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for xdr_u_int in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_u_int in -l$dap_xdrlib... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5
+$as_echo_n "checking how to link with libpth... " >&6; }
+if ${ac_cv_libpth_libs+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_u_int ();
-int
-main ()
-{
-return xdr_u_int ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_Lib=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_Lib=no"
-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- dap_xdrint=4
-fi
-fi
-fi
-fi
- case "$dap_xdrint" in
- 1) # uint32_t
- XDR_INT32=xdr_int32_t
- XDR_UINT32=xdr_uint32_t
- XDR_INT16=xdr_int16_t
- XDR_UINT16=xdr_uint16_t
- ;;
- 2) # u_int32_t
- XDR_INT32=xdr_int32_t
- XDR_UINT32=xdr_u_int32_t
- XDR_INT16=xdr_int16_t
- XDR_UINT16=xdr_u_int16_t
- ;;
- 3) # uint
- XDR_INT32=xdr_int
- XDR_UINT32=xdr_uint
- XDR_INT16=xdr_short
- XDR_UINT16=xdr_ushort
- ;;
- 4) # u_int
- XDR_INT32=xdr_int
- XDR_UINT32=xdr_u_int
- XDR_INT16=xdr_short
- XDR_UINT16=xdr_u_short
- ;;
- *)
- { { $as_echo "$as_me:$LINENO: error: Cannot determine DODS XDR integer sizes" >&5
-$as_echo "$as_me: error: Cannot determine DODS XDR integer sizes" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
- XDR_FLOAT64=xdr_double
- XDR_FLOAT32=xdr_float
+ use_additional=yes
-cat >>confdefs.h <<_ACEOF
-#define XDR_INT16 $XDR_INT16
-_ACEOF
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
-cat >>confdefs.h <<_ACEOF
-#define XDR_UINT16 $XDR_UINT16
-_ACEOF
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
-cat >>confdefs.h <<_ACEOF
-#define XDR_INT32 $XDR_INT32
-_ACEOF
+# Check whether --with-libpth-prefix was given.
+if test "${with_libpth_prefix+set}" = set; then :
+ withval=$with_libpth_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
-cat >>confdefs.h <<_ACEOF
-#define XDR_UINT32 $XDR_UINT32
-_ACEOF
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
-cat >>confdefs.h <<_ACEOF
-#define XDR_FLOAT64 $XDR_FLOAT64
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define XDR_FLOAT32 $XDR_FLOAT32
-_ACEOF
-
-
-# Check whether --enable-runtime-endian-check was given.
-if test "${enable_runtime_endian_check+set}" = set; then
- enableval=$enable_runtime_endian_check;
-fi
-
-
-if test "x$enable_runtime_endian_check" = "xyes"; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define COMPUTE_ENDIAN_AT_RUNTIME 1
-_ACEOF
-
-
-fi
-
-
-# Checks for library functions.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in alarm atexit bzero dup2 getcwd getpagesize localtime_r memmove memset pow putenv setenv strchr strerror strtol strtoul timegm mktime
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- LIBC_FATAL_STDERR_=1
- export LIBC_FATAL_STDERR_
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments. Useless!
-{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_working_alloca_h=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_working_alloca_h=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_alloca_works=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_alloca_works=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-else
- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble. Some versions do not even contain alloca or
-# contain a buggy version. If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-
-
-
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
-
-
-{ $as_echo "$as_me:$LINENO: checking whether 'alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether 'alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then
- ac_cv_os_cray=yes
-else
- ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
- break
-fi
-
- done
-fi
-
-{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_c_stack_direction=0
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-find_stack_direction (int *addr, int depth)
-{
- int dir, dummy = 0;
- if (! addr)
- addr = &dummy;
- *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
- dir = depth ? find_stack_direction (addr, depth - 1) : 0;
- return dir + dummy;
-}
-
-int
-main (int argc, char **argv)
-{
- return find_stack_direction (0, argc + !argv + 20) < 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_stack_direction=1
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-
- GNULIB_BTOWC=0;
- GNULIB_WCTOB=0;
- GNULIB_MBSINIT=0;
- GNULIB_MBRTOWC=0;
- GNULIB_MBRLEN=0;
- GNULIB_MBSRTOWCS=0;
- GNULIB_MBSNRTOWCS=0;
- GNULIB_WCRTOMB=0;
- GNULIB_WCSRTOMBS=0;
- GNULIB_WCSNRTOMBS=0;
- GNULIB_WCWIDTH=0;
- GNULIB_WMEMCHR=0;
- GNULIB_WMEMCMP=0;
- GNULIB_WMEMCPY=0;
- GNULIB_WMEMMOVE=0;
- GNULIB_WMEMSET=0;
- GNULIB_WCSLEN=0;
- GNULIB_WCSNLEN=0;
- GNULIB_WCSCPY=0;
- GNULIB_WCPCPY=0;
- GNULIB_WCSNCPY=0;
- GNULIB_WCPNCPY=0;
- GNULIB_WCSCAT=0;
- GNULIB_WCSNCAT=0;
- GNULIB_WCSCMP=0;
- GNULIB_WCSNCMP=0;
- GNULIB_WCSCASECMP=0;
- GNULIB_WCSNCASECMP=0;
- GNULIB_WCSCOLL=0;
- GNULIB_WCSXFRM=0;
- GNULIB_WCSDUP=0;
- GNULIB_WCSCHR=0;
- GNULIB_WCSRCHR=0;
- GNULIB_WCSCSPN=0;
- GNULIB_WCSSPN=0;
- GNULIB_WCSPBRK=0;
- GNULIB_WCSSTR=0;
- GNULIB_WCSTOK=0;
- GNULIB_WCSWIDTH=0;
- HAVE_BTOWC=1;
- HAVE_MBSINIT=1;
- HAVE_MBRTOWC=1;
- HAVE_MBRLEN=1;
- HAVE_MBSRTOWCS=1;
- HAVE_MBSNRTOWCS=1;
- HAVE_WCRTOMB=1;
- HAVE_WCSRTOMBS=1;
- HAVE_WCSNRTOMBS=1;
- HAVE_WMEMCHR=1;
- HAVE_WMEMCMP=1;
- HAVE_WMEMCPY=1;
- HAVE_WMEMMOVE=1;
- HAVE_WMEMSET=1;
- HAVE_WCSLEN=1;
- HAVE_WCSNLEN=1;
- HAVE_WCSCPY=1;
- HAVE_WCPCPY=1;
- HAVE_WCSNCPY=1;
- HAVE_WCPNCPY=1;
- HAVE_WCSCAT=1;
- HAVE_WCSNCAT=1;
- HAVE_WCSCMP=1;
- HAVE_WCSNCMP=1;
- HAVE_WCSCASECMP=1;
- HAVE_WCSNCASECMP=1;
- HAVE_WCSCOLL=1;
- HAVE_WCSXFRM=1;
- HAVE_WCSDUP=1;
- HAVE_WCSCHR=1;
- HAVE_WCSRCHR=1;
- HAVE_WCSCSPN=1;
- HAVE_WCSSPN=1;
- HAVE_WCSPBRK=1;
- HAVE_WCSSTR=1;
- HAVE_WCSTOK=1;
- HAVE_WCSWIDTH=1;
- HAVE_DECL_WCTOB=1;
- HAVE_DECL_WCWIDTH=1;
- REPLACE_MBSTATE_T=0;
- REPLACE_BTOWC=0;
- REPLACE_WCTOB=0;
- REPLACE_MBSINIT=0;
- REPLACE_MBRTOWC=0;
- REPLACE_MBRLEN=0;
- REPLACE_MBSRTOWCS=0;
- REPLACE_MBSNRTOWCS=0;
- REPLACE_WCRTOMB=0;
- REPLACE_WCSRTOMBS=0;
- REPLACE_WCSNRTOMBS=0;
- REPLACE_WCWIDTH=0;
- REPLACE_WCSWIDTH=0;
-
-
- { $as_echo "$as_me:$LINENO: checking whether <wchar.h> uses 'inline' correctly" >&5
-$as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
-if test "${gl_cv_header_wchar_h_correct_inline+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- gl_cv_header_wchar_h_correct_inline=yes
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-extern int zero (void);
-int main () { return zero(); }
-
-_ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- mv conftest.$ac_objext conftest1.$ac_objext
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int zero (void) { return 0; }
-
-_ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- mv conftest.$ac_objext conftest2.$ac_objext
- if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
- :
- else
- gl_cv_header_wchar_h_correct_inline=no
- fi
- fi
- fi
- rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_wchar_h_correct_inline" >&5
-$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
- if test $gl_cv_header_wchar_h_correct_inline = no; then
- { { $as_echo "$as_me:$LINENO: error: <wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
-This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
-C99 mode. You have four options:
- - Add the flag -fgnu89-inline to CC and reconfigure, or
- - Fix your include files, using parts of
- <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
- - Use a gcc version older than 4.3, or
- - Don't use the flags -std=c99 or -std=gnu99.
-Configuration aborted." >&5
-$as_echo "$as_me: error: <wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
-This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
-C99 mode. You have four options:
- - Add the flag -fgnu89-inline to CC and reconfigure, or
- - Fix your include files, using parts of
- <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
- - Use a gcc version older than 4.3, or
- - Don't use the flags -std=c99 or -std=gnu99.
-Configuration aborted." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
-
-
-
-for ac_func in $ac_func_list
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if test "${am_cv_langinfo_codeset+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <langinfo.h>
-int
-main ()
-{
-char* cs = nl_langinfo(CODESET); return !cs;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- am_cv_langinfo_codeset=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_langinfo_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-$as_echo "$am_cv_langinfo_codeset" >&6; }
- if test $am_cv_langinfo_codeset = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
-
- fi
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for a traditional french locale" >&5
-$as_echo_n "checking for a traditional french locale... " >&6; }
-if test "${gt_cv_locale_fr+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
- /* Check whether the given locale name is recognized by the system. */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
- /* On native Windows, setlocale(category, "") looks at the system settings,
- not at the environment variables. Also, when an encoding suffix such
- as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
- category of the locale to "C". */
- if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
- || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
- return 1;
-#else
- if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
- /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
- is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
- On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
- succeeds but then nl_langinfo(CODESET) is "646". In this situation,
- some unit tests fail.
- On MirBSD 10, when an unsupported locale is specified, setlocale()
- succeeds but then nl_langinfo(CODESET) is "UTF-8". */
-#if HAVE_LANGINFO_CODESET
- {
- const char *cs = nl_langinfo (CODESET);
- if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
- || strcmp (cs, "UTF-8") == 0)
- return 1;
- }
-#endif
-#ifdef __CYGWIN__
- /* On Cygwin, avoid locale names without encoding suffix, because the
- locale_charset() function relies on the encoding suffix. Note that
- LC_ALL is set on the command line. */
- if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
- /* Check whether in the abbreviation of the second month, the second
- character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
- one byte long. This excludes the UTF-8 encoding. */
- t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
- if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */
- /* Check whether the decimal separator is a comma.
- On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
- are nl_langinfo(RADIXCHAR) are both ".". */
- if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
- return 0;
-}
-
-_ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest$ac_exeext; then
- case "$host_os" in
- # Handle native Windows specially, because there setlocale() interprets
- # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
- # "fr" or "fra" as "French" or "French_France.1252",
- # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
- # "ja" as "Japanese" or "Japanese_Japan.932",
- # and similar.
- mingw*)
- # Test for the native Windows locale name.
- if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr=French_France.1252
- else
- # None found.
- gt_cv_locale_fr=none
- fi
- ;;
- *)
- # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
- # configure script would override the LC_ALL setting. Likewise for
- # LC_CTYPE, which is also set at the beginning of the configure script.
- # Test for the usual locale name.
- if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr=fr_FR
- else
- # Test for the locale name with explicit encoding suffix.
- if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr=fr_FR.ISO-8859-1
- else
- # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
- if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr=fr_FR.ISO8859-1
- else
- # Test for the HP-UX locale name.
- if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr=fr_FR.iso88591
- else
- # Test for the Solaris 7 locale name.
- if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr=fr
- else
- # None found.
- gt_cv_locale_fr=none
- fi
- fi
- fi
- fi
- fi
- ;;
- esac
- fi
- rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_locale_fr" >&5
-$as_echo "$gt_cv_locale_fr" >&6; }
- LOCALE_FR=$gt_cv_locale_fr
-
-
-
-
-
-
-
- GNULIB_NL_LANGINFO=0;
- HAVE_NL_LANGINFO=1;
- REPLACE_NL_LANGINFO=0;
-
-
-
- { $as_echo "$as_me:$LINENO: checking whether the preprocessor supports include_next" >&5
-$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
-if test "${gl_cv_have_include_next+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- rm -rf conftestd1a conftestd1b conftestd2
- mkdir conftestd1a conftestd1b conftestd2
- cat <<EOF > conftestd1a/conftest.h
-#define DEFINED_IN_CONFTESTD1
-#include_next <conftest.h>
-#ifdef DEFINED_IN_CONFTESTD2
-int foo;
-#else
-#error "include_next doesn't work"
-#endif
-EOF
- cat <<EOF > conftestd1b/conftest.h
-#define DEFINED_IN_CONFTESTD1
-#include <stdio.h>
-#include_next <conftest.h>
-#ifdef DEFINED_IN_CONFTESTD2
-int foo;
-#else
-#error "include_next doesn't work"
-#endif
-EOF
- cat <<EOF > conftestd2/conftest.h
-#ifndef DEFINED_IN_CONFTESTD1
-#error "include_next test doesn't work"
-#endif
-#define DEFINED_IN_CONFTESTD2
-EOF
- gl_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
- cat >conftest.$ac_ext <<_ACEOF
-#include <conftest.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gl_cv_have_include_next=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
- cat >conftest.$ac_ext <<_ACEOF
-#include <conftest.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gl_cv_have_include_next=buggy
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_have_include_next=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CPPFLAGS="$gl_save_CPPFLAGS"
- rm -rf conftestd1a conftestd1b conftestd2
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_have_include_next" >&5
-$as_echo "$gl_cv_have_include_next" >&6; }
- PRAGMA_SYSTEM_HEADER=
- if test $gl_cv_have_include_next = yes; then
- INCLUDE_NEXT=include_next
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
- if test -n "$GCC"; then
- PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
- fi
- else
- if test $gl_cv_have_include_next = buggy; then
- INCLUDE_NEXT=include
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
- else
- INCLUDE_NEXT=include
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
- fi
- fi
-
-
-
- { $as_echo "$as_me:$LINENO: checking whether system header files limit the line length" >&5
-$as_echo_n "checking whether system header files limit the line length... " >&6; }
-if test "${gl_cv_pragma_columns+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef __TANDEM
-choke me
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "choke me" >/dev/null 2>&1; then
- gl_cv_pragma_columns=yes
-else
- gl_cv_pragma_columns=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_pragma_columns" >&5
-$as_echo "$gl_cv_pragma_columns" >&6; }
- if test $gl_cv_pragma_columns = yes; then
- PRAGMA_COLUMNS="#pragma COLUMNS 10000"
- else
- PRAGMA_COLUMNS=
- fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for working fcntl.h" >&5
-$as_echo_n "checking for working fcntl.h... " >&6; }
-if test "${gl_cv_header_working_fcntl_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- gl_cv_header_working_fcntl_h=cross-compiling
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/stat.h>
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #else /* on Windows with MSVC */
- # include <io.h>
- # include <stdlib.h>
- # defined sleep(n) _sleep ((n) * 1000)
- #endif
- #include <fcntl.h>
- #ifndef O_NOATIME
- #define O_NOATIME 0
- #endif
- #ifndef O_NOFOLLOW
- #define O_NOFOLLOW 0
- #endif
- static int const constants[] =
- {
- O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
- O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
- };
-
-int
-main ()
-{
-
- int result = !constants;
- #if HAVE_SYMLINK
- {
- static char const sym[] = "conftest.sym";
- if (symlink ("/dev/null", sym) != 0)
- result |= 2;
- else
- {
- int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
- if (fd >= 0)
- {
- close (fd);
- result |= 4;
- }
- }
- if (unlink (sym) != 0 || symlink (".", sym) != 0)
- result |= 2;
- else
- {
- int fd = open (sym, O_RDONLY | O_NOFOLLOW);
- if (fd >= 0)
- {
- close (fd);
- result |= 4;
- }
- }
- unlink (sym);
- }
- #endif
- {
- static char const file[] = "confdefs.h";
- int fd = open (file, O_RDONLY | O_NOATIME);
- if (fd < 0)
- result |= 8;
- else
- {
- struct stat st0;
- if (fstat (fd, &st0) != 0)
- result |= 16;
- else
- {
- char c;
- sleep (1);
- if (read (fd, &c, 1) != 1)
- result |= 24;
- else
- {
- if (close (fd) != 0)
- result |= 32;
- else
- {
- struct stat st1;
- if (stat (file, &st1) != 0)
- result |= 40;
- else
- if (st0.st_atime != st1.st_atime)
- result |= 64;
- }
- }
- }
- }
- }
- return result;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gl_cv_header_working_fcntl_h=yes
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-case $? in #(
- 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
- 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
- 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
- *) gl_cv_header_working_fcntl_h='no';;
- esac
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_working_fcntl_h" >&5
-$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
-
- case $gl_cv_header_working_fcntl_h in #(
- *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
- *) ac_val=1;;
- esac
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_WORKING_O_NOATIME $ac_val
-_ACEOF
-
-
- case $gl_cv_header_working_fcntl_h in #(
- *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
- *) ac_val=1;;
- esac
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_WORKING_O_NOFOLLOW $ac_val
-_ACEOF
-
-
-{ $as_echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
-$as_echo_n "checking whether getc_unlocked is declared... " >&6; }
-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-#ifndef getc_unlocked
- (void) getc_unlocked;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_getc_unlocked=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_getc_unlocked=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
-$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
-if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED 1
-_ACEOF
-
-
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED 0
-_ACEOF
-
-
-fi
-
-
-
- { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
- Lucky GNU user
- #endif
-#endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Lucky" >/dev/null 2>&1; then
- ac_cv_gnu_library_2_1=yes
-else
- ac_cv_gnu_library_2_1=no
-fi
-rm -f conftest*
-
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-$as_echo "$ac_cv_gnu_library_2_1" >&6; }
-
- GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
- GNULIB_LOCALECONV=0;
- GNULIB_SETLOCALE=0;
- GNULIB_DUPLOCALE=0;
- HAVE_DUPLOCALE=1;
- REPLACE_LOCALECONV=0;
- REPLACE_SETLOCALE=0;
- REPLACE_DUPLOCALE=0;
- REPLACE_STRUCT_LCONV=0;
-
-
- REPLACE_NULL=0;
- HAVE_MAX_ALIGN_T=1;
- HAVE_WCHAR_T=1;
-
-
- { $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
-$as_echo_n "checking for wchar_t... " >&6; }
-if test "${gt_cv_c_wchar_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
- wchar_t foo = (wchar_t)'\0';
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gt_cv_c_wchar_t=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_wchar_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
-$as_echo "$gt_cv_c_wchar_t" >&6; }
- if test $gt_cv_c_wchar_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WCHAR_T 1
-_ACEOF
-
- fi
-
-
-
-
- STDDEF_H=
- { $as_echo "$as_me:$LINENO: checking for max_align_t" >&5
-$as_echo_n "checking for max_align_t... " >&6; }
-if test "${ac_cv_type_max_align_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_max_align_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-
-
-int
-main ()
-{
-if (sizeof (max_align_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-
-
-int
-main ()
-{
-if (sizeof ((max_align_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_max_align_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_max_align_t" >&5
-$as_echo "$ac_cv_type_max_align_t" >&6; }
-if test "x$ac_cv_type_max_align_t" = x""yes; then
- :
-else
- HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h
-fi
-
- if test $gt_cv_c_wchar_t = no; then
- HAVE_WCHAR_T=0
- STDDEF_H=stddef.h
- fi
- { $as_echo "$as_me:$LINENO: checking whether NULL can be used in arbitrary expressions" >&5
-$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if test "${gl_cv_decl_null_works+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
- int test[2 * (sizeof NULL == sizeof (void *)) -1];
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gl_cv_decl_null_works=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_decl_null_works=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_decl_null_works" >&5
-$as_echo "$gl_cv_decl_null_works" >&6; }
- if test $gl_cv_decl_null_works = no; then
- REPLACE_NULL=1
- STDDEF_H=stddef.h
- fi
-
- if test -n "$STDDEF_H"; then
- GL_GENERATE_STDDEF_H_TRUE=
- GL_GENERATE_STDDEF_H_FALSE='#'
-else
- GL_GENERATE_STDDEF_H_TRUE='#'
- GL_GENERATE_STDDEF_H_FALSE=
-fi
-
- if test -n "$STDDEF_H"; then
-
-
-
-
-
-
-
-
- if test $gl_cv_have_include_next = yes; then
- gl_cv_next_stddef_h='<'stddef.h'>'
- else
- { $as_echo "$as_me:$LINENO: checking absolute name of <stddef.h>" >&5
-$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if test "${gl_cv_next_stddef_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
-
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-_ACEOF
- case "$host_os" in
- aix*) gl_absname_cpp="$ac_cpp -C" ;;
- *) gl_absname_cpp="$ac_cpp" ;;
- esac
-
- case "$host_os" in
- mingw*)
- gl_dirsep_regex='[/\\]'
- ;;
- *)
- gl_dirsep_regex='\/'
- ;;
- esac
- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
- gl_header_literal_regex=`echo 'stddef.h' \
- | sed -e "$gl_make_literal_regex_sed"`
- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
- s|^/[^/]|//&|
- p
- q
- }'
-
- gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
- sed -n "$gl_absolute_header_sed"`
-
- gl_header=$gl_cv_absolute_stddef_h
- gl_cv_next_stddef_h='"'$gl_header'"'
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stddef_h" >&5
-$as_echo "$gl_cv_next_stddef_h" >&6; }
- fi
- NEXT_STDDEF_H=$gl_cv_next_stddef_h
-
- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
- gl_next_as_first_directive='<'stddef.h'>'
- else
- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
- gl_next_as_first_directive=$gl_cv_next_stddef_h
- fi
- NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
-
-
-
-
- fi
-
-
-
-
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-
-
-
-# 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
-else
- with_gnu_ld=no
-fi
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- 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
-
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$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
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [\\/]* | ?:[\\/]*)
- re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
- 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"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${acl_cv_path_LD+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$LD"; then
- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$acl_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- acl_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 `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$acl_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes
- ;;
-*)
- acl_cv_prog_gnu_ld=no
- ;;
-esac
-fi
-{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
- wl="$acl_cv_wl"
- acl_libext="$acl_cv_libext"
- acl_shlibext="$acl_cv_shlibext"
- acl_libname_spec="$acl_cv_libname_spec"
- acl_library_names_spec="$acl_cv_library_names_spec"
- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- acl_hardcode_direct="$acl_cv_hardcode_direct"
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
- # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
- enableval=$enable_rpath; :
-else
- enable_rpath=yes
-fi
-
-
-
-
- acl_libdirstem=lib
- acl_libdirstem2=
- case "$host_os" in
- solaris*)
- { $as_echo "$as_me:$LINENO: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if test "${gl_cv_solaris_64bit+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef _LP64
-sixtyfour bits
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "sixtyfour bits" >/dev/null 2>&1; then
- gl_cv_solaris_64bit=yes
-else
- gl_cv_solaris_64bit=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
- if test $gl_cv_solaris_64bit = yes; then
- acl_libdirstem=lib/64
- case "$host_cpu" in
- sparc*) acl_libdirstem2=lib/sparcv9 ;;
- i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
- esac
- fi
- ;;
- *)
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= }"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- */../ | */.. )
- # Better ignore directories of this form. They are misleading.
- ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
- fi
- done
- IFS="$acl_save_IFS"
- fi
- ;;
- esac
- test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-
-
-
- gl_threads_api=none
- LIBTHREAD=
- LTLIBTHREAD=
- LIBMULTITHREAD=
- LTLIBMULTITHREAD=
- if test "$gl_use_threads" != no; then
- { $as_echo "$as_me:$LINENO: checking whether imported symbols can be declared weak" >&5
-$as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
-if test "${gl_cv_have_weak+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- gl_cv_have_weak=no
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-extern void xyzzy ();
-#pragma weak xyzzy
-int
-main ()
-{
-xyzzy();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- gl_cv_have_weak=maybe
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $gl_cv_have_weak = maybe; then
- if test "$cross_compiling" = yes; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __ELF__
- Extensible Linking Format
- #endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Extensible Linking Format" >/dev/null 2>&1; then
- gl_cv_have_weak="guessing yes"
-else
- gl_cv_have_weak="guessing no"
-fi
-rm -f conftest*
-
-
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdio.h>
-#pragma weak fputs
-int main ()
-{
- return (fputs == NULL);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gl_cv_have_weak=yes
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_have_weak=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
- fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_have_weak" >&5
-$as_echo "$gl_cv_have_weak" >&6; }
- if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
- # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
- # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
- if test "${ac_cv_header_pthread_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
-$as_echo_n "checking for pthread.h... " >&6; }
-if test "${ac_cv_header_pthread_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-$as_echo "$ac_cv_header_pthread_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking pthread.h usability" >&5
-$as_echo_n "checking pthread.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <pthread.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking pthread.h presence" >&5
-$as_echo_n "checking pthread.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
-$as_echo_n "checking for pthread.h... " >&6; }
-if test "${ac_cv_header_pthread_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_pthread_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-$as_echo "$ac_cv_header_pthread_h" >&6; }
-
-fi
-if test "x$ac_cv_header_pthread_h" = x""yes; then
- gl_have_pthread_h=yes
-else
- gl_have_pthread_h=no
-fi
-
-
- if test "$gl_have_pthread_h" = yes; then
- # Other possible tests:
- # -lpthreads (FSU threads, PCthreads)
- # -lgthreads
- gl_have_pthread=
- # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
- # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
- # the second one only in libpthread, and lock.c needs it.
- #
- # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
- # needs -pthread for some reason. See:
- # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
- save_LIBS=$LIBS
- for gl_pthread in '' '-pthread'; do
- LIBS="$LIBS $gl_pthread"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
- pthread_mutex_t m;
- pthread_mutexattr_t ma;
-
-int
-main ()
-{
-pthread_mutex_lock (&m);
- pthread_mutexattr_init (&ma);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- gl_have_pthread=yes
- LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
- LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$save_LIBS
- test -n "$gl_have_pthread" && break
- done
-
- # Test for libpthread by looking for pthread_kill. (Not pthread_self,
- # since it is defined as a macro on OSF/1.)
- if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
- # The program links fine without libpthread. But it may actually
- # need to link with libpthread in order to create multiple threads.
- { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
-int
-main ()
-{
-return pthread_kill ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_pthread_pthread_kill=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_pthread_kill=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
- # On Solaris and HP-UX, most pthread functions exist also in libc.
- # Therefore pthread_in_use() needs to actually try to create a
- # thread: pthread_create from libc will fail, whereas
- # pthread_create will actually create a thread.
- case "$host_os" in
- solaris* | hpux*)
-
-cat >>confdefs.h <<\_ACEOF
-#define PTHREAD_IN_USE_DETECTION_HARD 1
-_ACEOF
-
- esac
-
-fi
-
- elif test -z "$gl_have_pthread"; then
- # Some library is needed. Try libpthread and libc_r.
- { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
-int
-main ()
-{
-return pthread_kill ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_pthread_pthread_kill=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_pthread_kill=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
- gl_have_pthread=yes
- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-fi
-
- if test -z "$gl_have_pthread"; then
- # For FreeBSD 4.
- { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lc_r" >&5
-$as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
-if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
-int
-main ()
-{
-return pthread_kill ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_c_r_pthread_kill=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_c_r_pthread_kill=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_kill" >&5
-$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then
- gl_have_pthread=yes
- LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
- LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
-fi
-
- fi
- fi
- if test -n "$gl_have_pthread"; then
- gl_threads_api=posix
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_POSIX_THREADS 1
-_ACEOF
-
- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_POSIX_THREADS_WEAK 1
-_ACEOF
-
- LIBTHREAD=
- LTLIBTHREAD=
- fi
- fi
- fi
- fi
- fi
- if test -z "$gl_have_pthread"; then
- if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
- gl_have_solaristhread=
- gl_save_LIBS="$LIBS"
- LIBS="$LIBS -lthread"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <thread.h>
-#include <synch.h>
-
-int
-main ()
-{
-thr_self();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- gl_have_solaristhread=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gl_save_LIBS"
- if test -n "$gl_have_solaristhread"; then
- gl_threads_api=solaris
- LIBTHREAD=-lthread
- LTLIBTHREAD=-lthread
- LIBMULTITHREAD="$LIBTHREAD"
- LTLIBMULTITHREAD="$LTLIBTHREAD"
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SOLARIS_THREADS 1
-_ACEOF
-
- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SOLARIS_THREADS_WEAK 1
-_ACEOF
-
- LIBTHREAD=
- LTLIBTHREAD=
- fi
- fi
- fi
- fi
- if test "$gl_use_threads" = pth; then
- gl_save_CPPFLAGS="$CPPFLAGS"
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking how to link with libpth" >&5
-$as_echo_n "checking how to link with libpth... " >&6; }
-if test "${ac_cv_libpth_libs+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
-
-
-
-
-
-
-
- use_additional=yes
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
-
-# Check whether --with-libpth-prefix was given.
-if test "${with_libpth_prefix+set}" = set; then
- withval=$with_libpth_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && ! test -d "$withval/$acl_libdirstem"; then
- additional_libdir="$withval/$acl_libdirstem2"
- fi
- fi
- fi
-
-fi
-
- LIBPTH=
- LTLIBPTH=
- INCPTH=
- LIBPTH_PREFIX=
- HAVE_LIBPTH=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='pth '
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIBPTH="${LIBPTH}${LIBPTH:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$value"
- else
- :
- fi
- else
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no \
- || test "X$found_dir" = "X/usr/$acl_libdirstem" \
- || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- if test "$acl_hardcode_direct" = yes; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- haveit=
- for x in $LDFLAGS $LIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_a"
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir -l$name"
- fi
- fi
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- if test "$name" = 'pth'; then
- LIBPTH_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- */$acl_libdirstem2 | */$acl_libdirstem2/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
- if test "$name" = 'pth'; then
- LIBPTH_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INCPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- INCPTH="${INCPTH}${INCPTH:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- if test -n "$found_la"; then
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
- && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
- || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- LIBPTH="${LIBPTH}${LIBPTH:+ }$dep"
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$dep"
- ;;
- esac
- done
- fi
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
- else
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-R$found_dir"
- done
- fi
-
-
-
-
-
-
- ac_cv_libpth_libs="$LIBPTH"
- ac_cv_libpth_ltlibs="$LTLIBPTH"
- ac_cv_libpth_cppflags="$INCPTH"
- ac_cv_libpth_prefix="$LIBPTH_PREFIX"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_libpth_libs" >&5
-$as_echo "$ac_cv_libpth_libs" >&6; }
- LIBPTH="$ac_cv_libpth_libs"
- LTLIBPTH="$ac_cv_libpth_ltlibs"
- INCPTH="$ac_cv_libpth_cppflags"
- LIBPTH_PREFIX="$ac_cv_libpth_prefix"
-
- for element in $INCPTH; do
- haveit=
- for x in $CPPFLAGS; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
-
-
-
-
- HAVE_LIBPTH=yes
-
-
-
- gl_have_pth=
- gl_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBPTH"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pth.h>
-int
-main ()
-{
-pth_self();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- gl_have_pth=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gl_save_LIBS"
- if test -n "$gl_have_pth"; then
- gl_threads_api=pth
- LIBTHREAD="$LIBPTH"
- LTLIBTHREAD="$LTLIBPTH"
- LIBMULTITHREAD="$LIBTHREAD"
- LTLIBMULTITHREAD="$LTLIBTHREAD"
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_PTH_THREADS 1
-_ACEOF
-
- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_PTH_THREADS_WEAK 1
-_ACEOF
-
- LIBTHREAD=
- LTLIBTHREAD=
- fi
- fi
- else
- CPPFLAGS="$gl_save_CPPFLAGS"
- fi
- fi
- if test -z "$gl_have_pthread"; then
- case "$gl_use_threads" in
- yes | windows | win32) # The 'win32' is for backward compatibility.
- if { case "$host_os" in
- mingw*) true;;
- *) false;;
- esac
- }; then
- gl_threads_api=windows
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_WINDOWS_THREADS 1
-_ACEOF
-
- fi
- ;;
- esac
- fi
- fi
- { $as_echo "$as_me:$LINENO: checking for multithread API to use" >&5
-$as_echo_n "checking for multithread API to use... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $gl_threads_api" >&5
-$as_echo "$gl_threads_api" >&6; }
-
-
-
-
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for mbstate_t" >&5
-$as_echo_n "checking for mbstate_t... " >&6; }
-if test "${ac_cv_type_mbstate_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int
-main ()
-{
-mbstate_t x; return sizeof x;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_mbstate_t=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_mbstate_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
-$as_echo "$ac_cv_type_mbstate_t" >&6; }
- if test $ac_cv_type_mbstate_t = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MBSTATE_T 1
-_ACEOF
-
- else
-
-cat >>confdefs.h <<\_ACEOF
-#define mbstate_t int
-_ACEOF
-
- fi
-
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for a traditional japanese locale" >&5
-$as_echo_n "checking for a traditional japanese locale... " >&6; }
-if test "${gt_cv_locale_ja+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
- const char *p;
- /* Check whether the given locale name is recognized by the system. */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
- /* On native Windows, setlocale(category, "") looks at the system settings,
- not at the environment variables. Also, when an encoding suffix such
- as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
- category of the locale to "C". */
- if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
- || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
- return 1;
-#else
- if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
- /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
- is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
- On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
- succeeds but then nl_langinfo(CODESET) is "646". In this situation,
- some unit tests fail.
- On MirBSD 10, when an unsupported locale is specified, setlocale()
- succeeds but then nl_langinfo(CODESET) is "UTF-8". */
-#if HAVE_LANGINFO_CODESET
- {
- const char *cs = nl_langinfo (CODESET);
- if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
- || strcmp (cs, "UTF-8") == 0)
- return 1;
- }
-#endif
-#ifdef __CYGWIN__
- /* On Cygwin, avoid locale names without encoding suffix, because the
- locale_charset() function relies on the encoding suffix. Note that
- LC_ALL is set on the command line. */
- if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
- /* Check whether MB_CUR_MAX is > 1. This excludes the dysfunctional locales
- on Cygwin 1.5.x. */
- if (MB_CUR_MAX == 1)
- return 1;
- /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
- This excludes the UTF-8 encoding (except on MirBSD). */
- t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
- if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
- for (p = buf; *p != '\0'; p++)
- if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
- return 1;
- return 0;
-}
-
-_ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest$ac_exeext; then
- case "$host_os" in
- # Handle native Windows specially, because there setlocale() interprets
- # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
- # "fr" or "fra" as "French" or "French_France.1252",
- # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
- # "ja" as "Japanese" or "Japanese_Japan.932",
- # and similar.
- mingw*)
- # Note that on native Windows, the Japanese locale is
- # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
- # cannot use it here.
- gt_cv_locale_ja=none
- ;;
- *)
- # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
- # configure script would override the LC_ALL setting. Likewise for
- # LC_CTYPE, which is also set at the beginning of the configure script.
- # Test for the AIX locale name.
- if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_ja=ja_JP
- else
- # Test for the locale name with explicit encoding suffix.
- if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_ja=ja_JP.EUC-JP
- else
- # Test for the HP-UX, OSF/1, NetBSD locale name.
- if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_ja=ja_JP.eucJP
- else
- # Test for the IRIX, FreeBSD locale name.
- if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_ja=ja_JP.EUC
- else
- # Test for the Solaris 7 locale name.
- if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_ja=ja
- else
- # Special test for NetBSD 1.6.
- if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
- gt_cv_locale_ja=ja_JP.eucJP
- else
- # None found.
- gt_cv_locale_ja=none
- fi
- fi
- fi
- fi
- fi
- fi
- ;;
- esac
- fi
- rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_locale_ja" >&5
-$as_echo "$gt_cv_locale_ja" >&6; }
- LOCALE_JA=$gt_cv_locale_ja
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for a transitional chinese locale" >&5
-$as_echo_n "checking for a transitional chinese locale... " >&6; }
-if test "${gt_cv_locale_zh_CN+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <locale.h>
-#include <stdlib.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
- const char *p;
- /* Check whether the given locale name is recognized by the system. */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
- /* On native Windows, setlocale(category, "") looks at the system settings,
- not at the environment variables. Also, when an encoding suffix such
- as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
- category of the locale to "C". */
- if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
- || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
- return 1;
-#else
- if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
- /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
- is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
- On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
- succeeds but then nl_langinfo(CODESET) is "646". In this situation,
- some unit tests fail.
- On MirBSD 10, when an unsupported locale is specified, setlocale()
- succeeds but then nl_langinfo(CODESET) is "UTF-8". */
-#if HAVE_LANGINFO_CODESET
- {
- const char *cs = nl_langinfo (CODESET);
- if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
- || strcmp (cs, "UTF-8") == 0)
- return 1;
- }
-#endif
-#ifdef __CYGWIN__
- /* On Cygwin, avoid locale names without encoding suffix, because the
- locale_charset() function relies on the encoding suffix. Note that
- LC_ALL is set on the command line. */
- if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
- /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
- This excludes the UTF-8 encoding (except on MirBSD). */
- t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
- if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
- for (p = buf; *p != '\0'; p++)
- if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
- return 1;
- /* Check whether a typical GB18030 multibyte sequence is recognized as a
- single wide character. This excludes the GB2312 and GBK encodings. */
- if (mblen ("\203\062\332\066", 5) != 4)
- return 1;
- return 0;
-}
-
-_ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest$ac_exeext; then
- case "$host_os" in
- # Handle native Windows specially, because there setlocale() interprets
- # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
- # "fr" or "fra" as "French" or "French_France.1252",
- # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
- # "ja" as "Japanese" or "Japanese_Japan.932",
- # and similar.
- mingw*)
- # Test for the hypothetical native Windows locale name.
- if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_zh_CN=Chinese_China.54936
- else
- # None found.
- gt_cv_locale_zh_CN=none
- fi
- ;;
- solaris2.8)
- # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
- # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
- # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
- gt_cv_locale_zh_CN=none
- ;;
- *)
- # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
- # configure script would override the LC_ALL setting. Likewise for
- # LC_CTYPE, which is also set at the beginning of the configure script.
- # Test for the locale name without encoding suffix.
- if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_zh_CN=zh_CN
- else
- # Test for the locale name with explicit encoding suffix.
- if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_zh_CN=zh_CN.GB18030
- else
- # None found.
- gt_cv_locale_zh_CN=none
- fi
- fi
- ;;
- esac
- else
- # If there was a link error, due to mblen(), the system is so old that
- # it certainly doesn't have a chinese locale.
- gt_cv_locale_zh_CN=none
- fi
- rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_locale_zh_CN" >&5
-$as_echo "$gt_cv_locale_zh_CN" >&6; }
- LOCALE_ZH_CN=$gt_cv_locale_zh_CN
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if test "${gt_cv_locale_fr_utf8+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
- /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl
- imitates locale dependent behaviour by looking at the environment
- variables, and all locales use the UTF-8 encoding. */
-#if !(defined __BEOS__ || defined __HAIKU__)
- /* Check whether the given locale name is recognized by the system. */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
- /* On native Windows, setlocale(category, "") looks at the system settings,
- not at the environment variables. Also, when an encoding suffix such
- as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
- category of the locale to "C". */
- if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
- || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
- return 1;
-# else
- if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
- /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
- is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
- On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
- succeeds but then nl_langinfo(CODESET) is "646". In this situation,
- some unit tests fail. */
-# if HAVE_LANGINFO_CODESET
- {
- const char *cs = nl_langinfo (CODESET);
- if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
- return 1;
- }
-# endif
-# ifdef __CYGWIN__
- /* On Cygwin, avoid locale names without encoding suffix, because the
- locale_charset() function relies on the encoding suffix. Note that
- LC_ALL is set on the command line. */
- if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
- /* Check whether in the abbreviation of the second month, the second
- character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
- two bytes long, with UTF-8 encoding. */
- t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
- if (strftime (buf, sizeof (buf), "%b", &t) < 4
- || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
- return 1;
-#endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */
- /* Check whether the decimal separator is a comma.
- On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
- are nl_langinfo(RADIXCHAR) are both ".". */
- if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
- return 0;
-}
-
-_ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest$ac_exeext; then
- case "$host_os" in
- # Handle native Windows specially, because there setlocale() interprets
- # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
- # "fr" or "fra" as "French" or "French_France.1252",
- # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
- # "ja" as "Japanese" or "Japanese_Japan.932",
- # and similar.
- mingw*)
- # Test for the hypothetical native Windows locale name.
- if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr_utf8=French_France.65001
- else
- # None found.
- gt_cv_locale_fr_utf8=none
- fi
- ;;
- *)
- # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
- # configure script would override the LC_ALL setting. Likewise for
- # LC_CTYPE, which is also set at the beginning of the configure script.
- # Test for the usual locale name.
- if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr_utf8=fr_FR
- else
- # Test for the locale name with explicit encoding suffix.
- if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr_utf8=fr_FR.UTF-8
- else
- # Test for the Solaris 7 locale name.
- if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
- gt_cv_locale_fr_utf8=fr.UTF-8
- else
- # None found.
- gt_cv_locale_fr_utf8=none
- fi
- fi
- fi
- ;;
- esac
- fi
- rm -fr conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
- LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
-
-
-
- GNULIB__EXIT=0;
- GNULIB_ATOLL=0;
- GNULIB_CALLOC_POSIX=0;
- GNULIB_CANONICALIZE_FILE_NAME=0;
- GNULIB_GETLOADAVG=0;
- GNULIB_GETSUBOPT=0;
- GNULIB_GRANTPT=0;
- GNULIB_MALLOC_POSIX=0;
- GNULIB_MBTOWC=0;
- GNULIB_MKDTEMP=0;
- GNULIB_MKOSTEMP=0;
- GNULIB_MKOSTEMPS=0;
- GNULIB_MKSTEMP=0;
- GNULIB_MKSTEMPS=0;
- GNULIB_POSIX_OPENPT=0;
- GNULIB_PTSNAME=0;
- GNULIB_PTSNAME_R=0;
- GNULIB_PUTENV=0;
- GNULIB_QSORT_R=0;
- GNULIB_RANDOM=0;
- GNULIB_RANDOM_R=0;
- GNULIB_REALLOC_POSIX=0;
- GNULIB_REALPATH=0;
- GNULIB_RPMATCH=0;
- GNULIB_SECURE_GETENV=0;
- GNULIB_SETENV=0;
- GNULIB_STRTOD=0;
- GNULIB_STRTOLL=0;
- GNULIB_STRTOULL=0;
- GNULIB_SYSTEM_POSIX=0;
- GNULIB_UNLOCKPT=0;
- GNULIB_UNSETENV=0;
- GNULIB_WCTOMB=0;
- HAVE__EXIT=1;
- HAVE_ATOLL=1;
- HAVE_CANONICALIZE_FILE_NAME=1;
- HAVE_DECL_GETLOADAVG=1;
- HAVE_GETSUBOPT=1;
- HAVE_GRANTPT=1;
- HAVE_MKDTEMP=1;
- HAVE_MKOSTEMP=1;
- HAVE_MKOSTEMPS=1;
- HAVE_MKSTEMP=1;
- HAVE_MKSTEMPS=1;
- HAVE_POSIX_OPENPT=1;
- HAVE_PTSNAME=1;
- HAVE_PTSNAME_R=1;
- HAVE_RANDOM=1;
- HAVE_RANDOM_H=1;
- HAVE_RANDOM_R=1;
- HAVE_REALPATH=1;
- HAVE_RPMATCH=1;
- HAVE_SECURE_GETENV=1;
- HAVE_SETENV=1;
- HAVE_DECL_SETENV=1;
- HAVE_STRTOD=1;
- HAVE_STRTOLL=1;
- HAVE_STRTOULL=1;
- HAVE_STRUCT_RANDOM_DATA=1;
- HAVE_SYS_LOADAVG_H=0;
- HAVE_UNLOCKPT=1;
- HAVE_DECL_UNSETENV=1;
- REPLACE_CALLOC=0;
- REPLACE_CANONICALIZE_FILE_NAME=0;
- REPLACE_MALLOC=0;
- REPLACE_MBTOWC=0;
- REPLACE_MKSTEMP=0;
- REPLACE_PTSNAME=0;
- REPLACE_PTSNAME_R=0;
- REPLACE_PUTENV=0;
- REPLACE_QSORT_R=0;
- REPLACE_RANDOM_R=0;
- REPLACE_REALLOC=0;
- REPLACE_REALPATH=0;
- REPLACE_SETENV=0;
- REPLACE_STRTOD=0;
- REPLACE_UNSETENV=0;
- REPLACE_WCTOMB=0;
-
-
- gl_cv_c_multiarch=no
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
- not a universal capable compiler
- #endif
- typedef int dummy;
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
- arch=
- prev=
- for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
- if test -n "$prev"; then
- case $word in
- i?86 | x86_64 | ppc | ppc64)
- if test -z "$arch" || test "$arch" = "$word"; then
- arch="$word"
- else
- gl_cv_c_multiarch=yes
- fi
- ;;
- esac
- prev=
- else
- if test "x$word" = "x-arch"; then
- prev=arch
- fi
- fi
- done
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $gl_cv_c_multiarch = yes; then
- APPLE_UNIVERSAL_BUILD=1
- else
- APPLE_UNIVERSAL_BUILD=0
- fi
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking whether alarm is declared" >&5
-$as_echo_n "checking whether alarm is declared... " >&6; }
-if test "${ac_cv_have_decl_alarm+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-#ifndef alarm
- (void) alarm;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_alarm=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_alarm=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_alarm" >&5
-$as_echo "$ac_cv_have_decl_alarm" >&6; }
-if test "x$ac_cv_have_decl_alarm" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ALARM 1
-_ACEOF
-
-
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ALARM 0
-_ACEOF
-
-
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
-$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
-if test "${ac_cv_c_restrict+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_restrict=no
- # The order here caters to the fact that C++ does not require restrict.
- for ac_kw in __restrict __restrict__ _Restrict restrict; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-typedef int *int_ptr;
- int foo (int_ptr $ac_kw ip) { return ip[0]; }
- int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
- int bar (int ip[$ac_kw]) { return ip[0]; }
-
-int
-main ()
-{
-int s[1];
- int *$ac_kw t = s;
- t[0] = 0;
- return foo (t) + bar (t);
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_restrict=$ac_kw
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$ac_cv_c_restrict" != no && break
- done
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
-$as_echo "$ac_cv_c_restrict" >&6; }
-
-
- case $ac_cv_c_restrict in
- restrict) ;;
- no) cat >>confdefs.h <<\_ACEOF
-#define restrict /**/
-_ACEOF
- ;;
- *) cat >>confdefs.h <<_ACEOF
-#define restrict $ac_cv_c_restrict
-_ACEOF
- ;;
- esac
-
-
-
-for ac_header in stdlib.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_malloc_0_nonnull=no
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_malloc_0_nonnull=yes
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_malloc_0_nonnull=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
+ && ! test -d "$withval/$acl_libdirstem"; then
+ additional_libdir="$withval/$acl_libdirstem2"
+ fi
+ fi
+ fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then
- gl_cv_func_malloc_0_nonnull=1
-else
- gl_cv_func_malloc_0_nonnull=0
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull
-_ACEOF
-
-
-
-
+ LIBPTH=
+ LTLIBPTH=
+ INCPTH=
+ LIBPTH_PREFIX=
+ HAVE_LIBPTH=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='pth '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBPTH="${LIBPTH}${LIBPTH:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBPTH; do
-{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if test "${ac_cv_header_stdbool_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
- #include <stdbool.h>
- #ifndef bool
- "error: bool is not defined"
- #endif
- #ifndef false
- "error: false is not defined"
- #endif
- #if false
- "error: false is not 0"
- #endif
- #ifndef true
- "error: true is not defined"
- #endif
- #if true != 1
- "error: true is not 1"
- #endif
- #ifndef __bool_true_false_are_defined
- "error: __bool_true_false_are_defined is not defined"
- #endif
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBPTH; do
- struct s { _Bool s: 1; _Bool t; } s;
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
- char a[true == 1 ? 1 : -1];
- char b[false == 0 ? 1 : -1];
- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
- char d[(bool) 0.5 == true ? 1 : -1];
- /* See body of main program for 'e'. */
- char f[(_Bool) 0.0 == false ? 1 : -1];
- char g[true];
- char h[sizeof (_Bool)];
- char i[sizeof s.t];
- enum { j = false, k = true, l = false * true, m = true * 256 };
- /* The following fails for
- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
- _Bool n[m];
- char o[sizeof n == m * sizeof n[0] ? 1 : -1];
- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
- /* Catch a bug in an HP-UX C compiler. See
- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
- */
- _Bool q = true;
- _Bool *pq = &q;
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
+ else
+ LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBPTH="${LIBPTH}${LIBPTH:+ }$found_a"
+ else
+ LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ if test "$name" = 'pth'; then
+ LIBPTH_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem2 | */$acl_libdirstem2/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+ if test "$name" = 'pth'; then
+ LIBPTH_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCPTH; do
-int
-main ()
-{
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
- bool e = &s;
- *pq |= q;
- *pq |= ! q;
- /* Refer to every declared value, to avoid compiler optimizations. */
- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
- + !m + !n + !o + !p + !q + !pq);
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCPTH="${INCPTH}${INCPTH:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBPTH; do
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdbool_h=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
- ac_cv_header_stdbool_h=no
-fi
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBPTH="${LIBPTH}${LIBPTH:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBPTH; do
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
-$as_echo "$ac_cv_header_stdbool_h" >&6; }
- { $as_echo "$as_me:$LINENO: checking for _Bool" >&5
-$as_echo_n "checking for _Bool... " >&6; }
-if test "${ac_cv_type__Bool+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type__Bool=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (_Bool))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((_Bool)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
- ac_cv_type__Bool=yes
-fi
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBPTH="${LIBPTH}${LIBPTH:+ }$dep"
+ LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
+ LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-R$found_dir"
+ done
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
-$as_echo "$ac_cv_type__Bool" >&6; }
-if test "x$ac_cv_type__Bool" = x""yes; then
-cat >>confdefs.h <<_ACEOF
-#define HAVE__BOOL 1
-_ACEOF
+ ac_cv_libpth_libs="$LIBPTH"
+ ac_cv_libpth_ltlibs="$LTLIBPTH"
+ ac_cv_libpth_cppflags="$INCPTH"
+ ac_cv_libpth_prefix="$LIBPTH_PREFIX"
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libpth_libs" >&5
+$as_echo "$ac_cv_libpth_libs" >&6; }
+ LIBPTH="$ac_cv_libpth_libs"
+ LTLIBPTH="$ac_cv_libpth_ltlibs"
+ INCPTH="$ac_cv_libpth_cppflags"
+ LIBPTH_PREFIX="$ac_cv_libpth_prefix"
+ for element in $INCPTH; do
+ haveit=
+ for x in $CPPFLAGS; do
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
- { $as_echo "$as_me:$LINENO: checking for unsigned long long int" >&5
-$as_echo_n "checking for unsigned long long int... " >&6; }
-if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_unsigned_long_long_int=yes
- if test "x${ac_cv_prog_cc_c99-no}" = xno; then
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* For now, do not test the preprocessor; as of 2007 there are too many
- implementations with broken preprocessors. Perhaps this can
- be revisited in 2012. In the meantime, code should not expect
- #if to work with literals wider than 32 bits. */
- /* Test literals. */
- long long int ll = 9223372036854775807ll;
- long long int nll = -9223372036854775807LL;
- unsigned long long int ull = 18446744073709551615ULL;
- /* Test constant expressions. */
- typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
- ? 1 : -1)];
- typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
- ? 1 : -1)];
- int i = 63;
-int
-main ()
-{
-/* Test availability of runtime routines for shift and division. */
- long long int llmax = 9223372036854775807ll;
- unsigned long long int ullmax = 18446744073709551615ull;
- return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
- | (llmax / ll) | (llmax % ll)
- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
- | (ullmax / ull) | (ullmax % ull));
- ;
- return 0;
-}
-
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
- ac_cv_type_unsigned_long_long_int=no
-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
-$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
- if test $ac_cv_type_unsigned_long_long_int = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-_ACEOF
- fi
+ HAVE_LIBPTH=yes
- { $as_echo "$as_me:$LINENO: checking for long long int" >&5
-$as_echo_n "checking for long long int... " >&6; }
-if test "${ac_cv_type_long_long_int+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_long_long_int=yes
- if test "x${ac_cv_prog_cc_c99-no}" = xno; then
- ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
- if test $ac_cv_type_long_long_int = yes; then
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ gl_have_pth=
+ gl_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBPTH"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <limits.h>
- #ifndef LLONG_MAX
- # define HALF \
- (1LL << (sizeof (long long int) * CHAR_BIT - 2))
- # define LLONG_MAX (HALF - 1 + HALF)
- #endif
+#include <pth.h>
int
main ()
{
-long long int n = 1;
- int i;
- for (i = 0; ; i++)
- {
- long long int m = n << i;
- if (m >> i != n)
- return 1;
- if (LLONG_MAX / 2 < m)
- break;
- }
- return 0;
+pth_self();
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_type_long_long_int=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
- fi
- fi
+if ac_fn_c_try_link "$LINENO"; then :
+ gl_have_pth=yes
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
-$as_echo "$ac_cv_type_long_long_int" >&6; }
- if test $ac_cv_type_long_long_int = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG_INT 1
-_ACEOF
-
- fi
-
-
-
-
-
-
-
-
- if test $ac_cv_type_long_long_int = yes; then
- HAVE_LONG_LONG_INT=1
- else
- HAVE_LONG_LONG_INT=0
- fi
-
-
- if test $ac_cv_type_unsigned_long_long_int = yes; then
- HAVE_UNSIGNED_LONG_LONG_INT=1
- else
- HAVE_UNSIGNED_LONG_LONG_INT=0
- fi
-
-
-
-
-
-
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gl_save_LIBS"
+ if test -n "$gl_have_pth"; then
+ gl_threads_api=pth
+ LIBTHREAD="$LIBPTH"
+ LTLIBTHREAD="$LTLIBPTH"
+ LIBMULTITHREAD="$LIBTHREAD"
+ LTLIBMULTITHREAD="$LTLIBTHREAD"
+$as_echo "#define USE_PTH_THREADS 1" >>confdefs.h
- if test $ac_cv_header_wchar_h = yes; then
- HAVE_WCHAR_H=1
- else
- HAVE_WCHAR_H=0
- fi
+ if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+ if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+$as_echo "#define USE_PTH_THREADS_WEAK 1" >>confdefs.h
- if test $ac_cv_header_inttypes_h = yes; then
- HAVE_INTTYPES_H=1
- else
- HAVE_INTTYPES_H=0
- fi
+ LIBTHREAD=
+ LTLIBTHREAD=
+ fi
+ fi
+ else
+ CPPFLAGS="$gl_save_CPPFLAGS"
+ fi
+ fi
+ if test -z "$gl_have_pthread"; then
+ case "$gl_use_threads" in
+ yes | windows | win32) # The 'win32' is for backward compatibility.
+ if { case "$host_os" in
+ mingw*) true;;
+ *) false;;
+ esac
+ }; then
+ gl_threads_api=windows
+$as_echo "#define USE_WINDOWS_THREADS 1" >>confdefs.h
- if test $ac_cv_header_sys_types_h = yes; then
- HAVE_SYS_TYPES_H=1
- else
- HAVE_SYS_TYPES_H=0
+ fi
+ ;;
+ esac
+ fi
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5
+$as_echo_n "checking for multithread API to use... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_threads_api" >&5
+$as_echo "$gl_threads_api" >&6; }
@@ -28486,1021 +20833,1052 @@ _ACEOF
-
-
-
-
-
- if test $gl_cv_have_include_next = yes; then
- gl_cv_next_stdint_h='<'stdint.h'>'
- else
- { $as_echo "$as_me:$LINENO: checking absolute name of <stdint.h>" >&5
-$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
-if test "${gl_cv_next_stdint_h+set}" = set; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+$as_echo_n "checking for mbstate_t... " >&6; }
+if ${ac_cv_type_mbstate_t+:} false; then :
$as_echo_n "(cached) " >&6
else
-
- if test $ac_cv_header_stdint_h = yes; then
-
-
-
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdint.h>
+$ac_includes_default
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+ <wchar.h>.
+ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+ included before <wchar.h>. */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+int
+main ()
+{
+mbstate_t x; return sizeof x;
+ ;
+ return 0;
+}
_ACEOF
- case "$host_os" in
- aix*) gl_absname_cpp="$ac_cpp -C" ;;
- *) gl_absname_cpp="$ac_cpp" ;;
- esac
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_type_mbstate_t=yes
+else
+ ac_cv_type_mbstate_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+$as_echo "$ac_cv_type_mbstate_t" >&6; }
+ if test $ac_cv_type_mbstate_t = yes; then
- case "$host_os" in
- mingw*)
- gl_dirsep_regex='[/\\]'
- ;;
- *)
- gl_dirsep_regex='\/'
- ;;
- esac
- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
- gl_header_literal_regex=`echo 'stdint.h' \
- | sed -e "$gl_make_literal_regex_sed"`
- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
- s|^/[^/]|//&|
- p
- q
- }'
+$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h
- gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
- sed -n "$gl_absolute_header_sed"`
+ else
- gl_header=$gl_cv_absolute_stdint_h
- gl_cv_next_stdint_h='"'$gl_header'"'
- else
- gl_cv_next_stdint_h='<'stdint.h'>'
- fi
+$as_echo "#define mbstate_t int" >>confdefs.h
+ fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdint_h" >&5
-$as_echo "$gl_cv_next_stdint_h" >&6; }
- fi
- NEXT_STDINT_H=$gl_cv_next_stdint_h
- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
- gl_next_as_first_directive='<'stdint.h'>'
- else
- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
- gl_next_as_first_directive=$gl_cv_next_stdint_h
- fi
- NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
- if test $ac_cv_header_stdint_h = yes; then
- HAVE_STDINT_H=1
- else
- HAVE_STDINT_H=0
- fi
- if test $ac_cv_header_stdint_h = yes; then
- { $as_echo "$as_me:$LINENO: checking whether stdint.h conforms to C99" >&5
-$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
-if test "${gl_cv_header_working_stdint_h+set}" = set; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+$as_echo_n "checking for a traditional japanese locale... " >&6; }
+if ${gt_cv_locale_ja+:} false; then :
$as_echo_n "(cached) " >&6
else
- gl_cv_header_working_stdint_h=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-#include <stdint.h>
-/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>. */
-#if !(defined WCHAR_MIN && defined WCHAR_MAX)
-#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+ const char *p;
+ /* Check whether the given locale name is recognized by the system. */
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+ /* On native Windows, setlocale(category, "") looks at the system settings,
+ not at the environment variables. Also, when an encoding suffix such
+ as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+ category of the locale to "C". */
+ if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+ || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+ return 1;
+#else
+ if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
+ /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+ On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+ succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+ some unit tests fail.
+ On MirBSD 10, when an unsupported locale is specified, setlocale()
+ succeeds but then nl_langinfo(CODESET) is "UTF-8". */
+#if HAVE_LANGINFO_CODESET
+ {
+ const char *cs = nl_langinfo (CODESET);
+ if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
+ || strcmp (cs, "UTF-8") == 0)
+ return 1;
+ }
+#endif
+#ifdef __CYGWIN__
+ /* On Cygwin, avoid locale names without encoding suffix, because the
+ locale_charset() function relies on the encoding suffix. Note that
+ LC_ALL is set on the command line. */
+ if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+ /* Check whether MB_CUR_MAX is > 1. This excludes the dysfunctional locales
+ on Cygwin 1.5.x. */
+ if (MB_CUR_MAX == 1)
+ return 1;
+ /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+ This excludes the UTF-8 encoding (except on MirBSD). */
+ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+ if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+ for (p = buf; *p != '\0'; p++)
+ if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+ return 1;
+ return 0;
+}
+
+_ACEOF
+ 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
+ case "$host_os" in
+ # Handle native Windows specially, because there setlocale() interprets
+ # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+ # "fr" or "fra" as "French" or "French_France.1252",
+ # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+ # "ja" as "Japanese" or "Japanese_Japan.932",
+ # and similar.
+ mingw*)
+ # Note that on native Windows, the Japanese locale is
+ # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
+ # cannot use it here.
+ gt_cv_locale_ja=none
+ ;;
+ *)
+ # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+ # configure script would override the LC_ALL setting. Likewise for
+ # LC_CTYPE, which is also set at the beginning of the configure script.
+ # Test for the AIX locale name.
+ if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_ja=ja_JP
+ else
+ # Test for the locale name with explicit encoding suffix.
+ if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_ja=ja_JP.EUC-JP
+ else
+ # Test for the HP-UX, OSF/1, NetBSD locale name.
+ if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_ja=ja_JP.eucJP
+ else
+ # Test for the IRIX, FreeBSD locale name.
+ if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_ja=ja_JP.EUC
+ else
+ # Test for the Solaris 7 locale name.
+ if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_ja=ja
+ else
+ # Special test for NetBSD 1.6.
+ if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+ gt_cv_locale_ja=ja_JP.eucJP
+ else
+ # None found.
+ gt_cv_locale_ja=none
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ ;;
+ esac
+ fi
+ rm -fr conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
+$as_echo "$gt_cv_locale_ja" >&6; }
+ LOCALE_JA=$gt_cv_locale_ja
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
-#ifdef INT8_MAX
-int8_t a1 = INT8_MAX;
-int8_t a1min = INT8_MIN;
-#endif
-#ifdef INT16_MAX
-int16_t a2 = INT16_MAX;
-int16_t a2min = INT16_MIN;
-#endif
-#ifdef INT32_MAX
-int32_t a3 = INT32_MAX;
-int32_t a3min = INT32_MIN;
-#endif
-#ifdef INT64_MAX
-int64_t a4 = INT64_MAX;
-int64_t a4min = INT64_MIN;
-#endif
-#ifdef UINT8_MAX
-uint8_t b1 = UINT8_MAX;
-#else
-typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
-#endif
-#ifdef UINT16_MAX
-uint16_t b2 = UINT16_MAX;
-#endif
-#ifdef UINT32_MAX
-uint32_t b3 = UINT32_MAX;
-#endif
-#ifdef UINT64_MAX
-uint64_t b4 = UINT64_MAX;
-#endif
-int_least8_t c1 = INT8_C (0x7f);
-int_least8_t c1max = INT_LEAST8_MAX;
-int_least8_t c1min = INT_LEAST8_MIN;
-int_least16_t c2 = INT16_C (0x7fff);
-int_least16_t c2max = INT_LEAST16_MAX;
-int_least16_t c2min = INT_LEAST16_MIN;
-int_least32_t c3 = INT32_C (0x7fffffff);
-int_least32_t c3max = INT_LEAST32_MAX;
-int_least32_t c3min = INT_LEAST32_MIN;
-int_least64_t c4 = INT64_C (0x7fffffffffffffff);
-int_least64_t c4max = INT_LEAST64_MAX;
-int_least64_t c4min = INT_LEAST64_MIN;
-uint_least8_t d1 = UINT8_C (0xff);
-uint_least8_t d1max = UINT_LEAST8_MAX;
-uint_least16_t d2 = UINT16_C (0xffff);
-uint_least16_t d2max = UINT_LEAST16_MAX;
-uint_least32_t d3 = UINT32_C (0xffffffff);
-uint_least32_t d3max = UINT_LEAST32_MAX;
-uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
-uint_least64_t d4max = UINT_LEAST64_MAX;
-int_fast8_t e1 = INT_FAST8_MAX;
-int_fast8_t e1min = INT_FAST8_MIN;
-int_fast16_t e2 = INT_FAST16_MAX;
-int_fast16_t e2min = INT_FAST16_MIN;
-int_fast32_t e3 = INT_FAST32_MAX;
-int_fast32_t e3min = INT_FAST32_MIN;
-int_fast64_t e4 = INT_FAST64_MAX;
-int_fast64_t e4min = INT_FAST64_MIN;
-uint_fast8_t f1 = UINT_FAST8_MAX;
-uint_fast16_t f2 = UINT_FAST16_MAX;
-uint_fast32_t f3 = UINT_FAST32_MAX;
-uint_fast64_t f4 = UINT_FAST64_MAX;
-#ifdef INTPTR_MAX
-intptr_t g = INTPTR_MAX;
-intptr_t gmin = INTPTR_MIN;
-#endif
-#ifdef UINTPTR_MAX
-uintptr_t h = UINTPTR_MAX;
-#endif
-intmax_t i = INTMAX_MAX;
-uintmax_t j = UINTMAX_MAX;
-#include <limits.h> /* for CHAR_BIT */
-#define TYPE_MINIMUM(t) \
- ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
-#define TYPE_MAXIMUM(t) \
- ((t) ((t) 0 < (t) -1 \
- ? (t) -1 \
- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-struct s {
- int check_PTRDIFF:
- PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
- && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
- ? 1 : -1;
- /* Detect bug in FreeBSD 6.0 / ia64. */
- int check_SIG_ATOMIC:
- SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
- && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
- ? 1 : -1;
- int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
- int check_WCHAR:
- WCHAR_MIN == TYPE_MINIMUM (wchar_t)
- && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
- ? 1 : -1;
- /* Detect bug in mingw. */
- int check_WINT:
- WINT_MIN == TYPE_MINIMUM (wint_t)
- && WINT_MAX == TYPE_MAXIMUM (wint_t)
- ? 1 : -1;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+$as_echo_n "checking for a transitional chinese locale... " >&6; }
+if ${gt_cv_locale_zh_CN+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
- /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others. */
- int check_UINT8_C:
- (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
- int check_UINT16_C:
- (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- /* Detect bugs in OpenBSD 3.9 stdint.h. */
-#ifdef UINT8_MAX
- int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#include <locale.h>
+#include <stdlib.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
#endif
-#ifdef UINT16_MAX
- int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+ const char *p;
+ /* Check whether the given locale name is recognized by the system. */
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+ /* On native Windows, setlocale(category, "") looks at the system settings,
+ not at the environment variables. Also, when an encoding suffix such
+ as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+ category of the locale to "C". */
+ if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+ || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+ return 1;
+#else
+ if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
-#ifdef UINT32_MAX
- int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+ /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+ On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+ succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+ some unit tests fail.
+ On MirBSD 10, when an unsupported locale is specified, setlocale()
+ succeeds but then nl_langinfo(CODESET) is "UTF-8". */
+#if HAVE_LANGINFO_CODESET
+ {
+ const char *cs = nl_langinfo (CODESET);
+ if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
+ || strcmp (cs, "UTF-8") == 0)
+ return 1;
+ }
#endif
-#ifdef UINT64_MAX
- int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#ifdef __CYGWIN__
+ /* On Cygwin, avoid locale names without encoding suffix, because the
+ locale_charset() function relies on the encoding suffix. Note that
+ LC_ALL is set on the command line. */
+ if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
#endif
- int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
- int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
- int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
- int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
- int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
- int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
- int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
- int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
- int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
- int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
- int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
-};
-
-int
-main ()
-{
-
- ;
+ /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+ This excludes the UTF-8 encoding (except on MirBSD). */
+ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+ if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+ for (p = buf; *p != '\0'; p++)
+ if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+ return 1;
+ /* Check whether a typical GB18030 multibyte sequence is recognized as a
+ single wide character. This excludes the GB2312 and GBK encodings. */
+ if (mblen ("\203\062\332\066", 5) != 4)
+ return 1;
return 0;
}
+
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+ (eval $ac_link) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- if test "$cross_compiling" = yes; then
- gl_cv_header_working_stdint_h=yes
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
+ case "$host_os" in
+ # Handle native Windows specially, because there setlocale() interprets
+ # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+ # "fr" or "fra" as "French" or "French_France.1252",
+ # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+ # "ja" as "Japanese" or "Japanese_Japan.932",
+ # and similar.
+ mingw*)
+ # Test for the hypothetical native Windows locale name.
+ if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_zh_CN=Chinese_China.54936
+ else
+ # None found.
+ gt_cv_locale_zh_CN=none
+ fi
+ ;;
+ solaris2.8)
+ # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
+ # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
+ # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
+ gt_cv_locale_zh_CN=none
+ ;;
+ *)
+ # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+ # configure script would override the LC_ALL setting. Likewise for
+ # LC_CTYPE, which is also set at the beginning of the configure script.
+ # Test for the locale name without encoding suffix.
+ if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_zh_CN=zh_CN
+ else
+ # Test for the locale name with explicit encoding suffix.
+ if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_zh_CN=zh_CN.GB18030
+ else
+ # None found.
+ gt_cv_locale_zh_CN=none
+ fi
+ fi
+ ;;
+ esac
+ else
+ # If there was a link error, due to mblen(), the system is so old that
+ # it certainly doesn't have a chinese locale.
+ gt_cv_locale_zh_CN=none
+ fi
+ rm -fr conftest*
-else
- cat >conftest.$ac_ext <<_ACEOF
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
+$as_echo "$gt_cv_locale_zh_CN" >&6; }
+ LOCALE_ZH_CN=$gt_cv_locale_zh_CN
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-#include <stdint.h>
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+$as_echo_n "checking for a french Unicode locale... " >&6; }
+if ${gt_cv_locale_fr_utf8+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-#include <stdio.h>
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
#include <string.h>
-#define MVAL(macro) MVAL1(macro)
-#define MVAL1(expression) #expression
-static const char *macro_values[] =
+struct tm t;
+char buf[16];
+int main () {
+ /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl
+ imitates locale dependent behaviour by looking at the environment
+ variables, and all locales use the UTF-8 encoding. */
+#if !(defined __BEOS__ || defined __HAIKU__)
+ /* Check whether the given locale name is recognized by the system. */
+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+ /* On native Windows, setlocale(category, "") looks at the system settings,
+ not at the environment variables. Also, when an encoding suffix such
+ as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+ category of the locale to "C". */
+ if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+ || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+ return 1;
+# else
+ if (setlocale (LC_ALL, "") == NULL) return 1;
+# endif
+ /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+ On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+ succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+ some unit tests fail. */
+# if HAVE_LANGINFO_CODESET
{
-#ifdef INT8_MAX
- MVAL (INT8_MAX),
-#endif
-#ifdef INT16_MAX
- MVAL (INT16_MAX),
-#endif
-#ifdef INT32_MAX
- MVAL (INT32_MAX),
-#endif
-#ifdef INT64_MAX
- MVAL (INT64_MAX),
-#endif
-#ifdef UINT8_MAX
- MVAL (UINT8_MAX),
-#endif
-#ifdef UINT16_MAX
- MVAL (UINT16_MAX),
-#endif
-#ifdef UINT32_MAX
- MVAL (UINT32_MAX),
+ const char *cs = nl_langinfo (CODESET);
+ if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+ return 1;
+ }
+# endif
+# ifdef __CYGWIN__
+ /* On Cygwin, avoid locale names without encoding suffix, because the
+ locale_charset() function relies on the encoding suffix. Note that
+ LC_ALL is set on the command line. */
+ if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+ /* Check whether in the abbreviation of the second month, the second
+ character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
+ two bytes long, with UTF-8 encoding. */
+ t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+ if (strftime (buf, sizeof (buf), "%b", &t) < 4
+ || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
+ return 1;
#endif
-#ifdef UINT64_MAX
- MVAL (UINT64_MAX),
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */
+ /* Check whether the decimal separator is a comma.
+ On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+ are nl_langinfo(RADIXCHAR) are both ".". */
+ if (localeconv () ->decimal_point[0] != ',') return 1;
#endif
- NULL
- };
-
-int
-main ()
-{
-
- const char **mv;
- for (mv = macro_values; *mv != NULL; mv++)
- {
- const char *value = *mv;
- /* Test whether it looks like a cast expression. */
- if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
- || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
- || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
- || strncmp (value, "((int)"/*)*/, 6) == 0
- || strncmp (value, "((signed short)"/*)*/, 15) == 0
- || strncmp (value, "((signed char)"/*)*/, 14) == 0)
- return mv - macro_values + 1;
- }
- return 0;
-
- ;
return 0;
}
+
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+ (eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gl_cv_header_working_stdint_h=yes
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
+ case "$host_os" in
+ # Handle native Windows specially, because there setlocale() interprets
+ # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+ # "fr" or "fra" as "French" or "French_France.1252",
+ # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+ # "ja" as "Japanese" or "Japanese_Japan.932",
+ # and similar.
+ mingw*)
+ # Test for the hypothetical native Windows locale name.
+ if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr_utf8=French_France.65001
+ else
+ # None found.
+ gt_cv_locale_fr_utf8=none
+ fi
+ ;;
+ *)
+ # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+ # configure script would override the LC_ALL setting. Likewise for
+ # LC_CTYPE, which is also set at the beginning of the configure script.
+ # Test for the usual locale name.
+ if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr_utf8=fr_FR
+ else
+ # Test for the locale name with explicit encoding suffix.
+ if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr_utf8=fr_FR.UTF-8
+ else
+ # Test for the Solaris 7 locale name.
+ if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ gt_cv_locale_fr_utf8=fr.UTF-8
+ else
+ # None found.
+ gt_cv_locale_fr_utf8=none
+ fi
+ fi
+ fi
+ ;;
+ esac
+ fi
+ rm -fr conftest*
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
+$as_echo "$gt_cv_locale_fr_utf8" >&6; }
+ LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
+
+
+
+ GNULIB__EXIT=0;
+ GNULIB_ATOLL=0;
+ GNULIB_CALLOC_POSIX=0;
+ GNULIB_CANONICALIZE_FILE_NAME=0;
+ GNULIB_GETLOADAVG=0;
+ GNULIB_GETSUBOPT=0;
+ GNULIB_GRANTPT=0;
+ GNULIB_MALLOC_POSIX=0;
+ GNULIB_MBTOWC=0;
+ GNULIB_MKDTEMP=0;
+ GNULIB_MKOSTEMP=0;
+ GNULIB_MKOSTEMPS=0;
+ GNULIB_MKSTEMP=0;
+ GNULIB_MKSTEMPS=0;
+ GNULIB_POSIX_OPENPT=0;
+ GNULIB_PTSNAME=0;
+ GNULIB_PTSNAME_R=0;
+ GNULIB_PUTENV=0;
+ GNULIB_QSORT_R=0;
+ GNULIB_RANDOM=0;
+ GNULIB_RANDOM_R=0;
+ GNULIB_REALLOC_POSIX=0;
+ GNULIB_REALPATH=0;
+ GNULIB_RPMATCH=0;
+ GNULIB_SECURE_GETENV=0;
+ GNULIB_SETENV=0;
+ GNULIB_STRTOD=0;
+ GNULIB_STRTOLL=0;
+ GNULIB_STRTOULL=0;
+ GNULIB_SYSTEM_POSIX=0;
+ GNULIB_UNLOCKPT=0;
+ GNULIB_UNSETENV=0;
+ GNULIB_WCTOMB=0;
+ HAVE__EXIT=1;
+ HAVE_ATOLL=1;
+ HAVE_CANONICALIZE_FILE_NAME=1;
+ HAVE_DECL_GETLOADAVG=1;
+ HAVE_GETSUBOPT=1;
+ HAVE_GRANTPT=1;
+ HAVE_MKDTEMP=1;
+ HAVE_MKOSTEMP=1;
+ HAVE_MKOSTEMPS=1;
+ HAVE_MKSTEMP=1;
+ HAVE_MKSTEMPS=1;
+ HAVE_POSIX_OPENPT=1;
+ HAVE_PTSNAME=1;
+ HAVE_PTSNAME_R=1;
+ HAVE_RANDOM=1;
+ HAVE_RANDOM_H=1;
+ HAVE_RANDOM_R=1;
+ HAVE_REALPATH=1;
+ HAVE_RPMATCH=1;
+ HAVE_SECURE_GETENV=1;
+ HAVE_SETENV=1;
+ HAVE_DECL_SETENV=1;
+ HAVE_STRTOD=1;
+ HAVE_STRTOLL=1;
+ HAVE_STRTOULL=1;
+ HAVE_STRUCT_RANDOM_DATA=1;
+ HAVE_SYS_LOADAVG_H=0;
+ HAVE_UNLOCKPT=1;
+ HAVE_DECL_UNSETENV=1;
+ REPLACE_CALLOC=0;
+ REPLACE_CANONICALIZE_FILE_NAME=0;
+ REPLACE_MALLOC=0;
+ REPLACE_MBTOWC=0;
+ REPLACE_MKSTEMP=0;
+ REPLACE_PTSNAME=0;
+ REPLACE_PTSNAME_R=0;
+ REPLACE_PUTENV=0;
+ REPLACE_QSORT_R=0;
+ REPLACE_RANDOM_R=0;
+ REPLACE_REALLOC=0;
+ REPLACE_REALPATH=0;
+ REPLACE_SETENV=0;
+ REPLACE_STRTOD=0;
+ REPLACE_UNSETENV=0;
+ REPLACE_WCTOMB=0;
+ gl_cv_c_multiarch=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __APPLE_CC__
+ not a universal capable compiler
+ #endif
+ typedef int dummy;
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ arch=
+ prev=
+ for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
+ if test -n "$prev"; then
+ case $word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$arch" || test "$arch" = "$word"; then
+ arch="$word"
+ else
+ gl_cv_c_multiarch=yes
+ fi
+ ;;
+ esac
+ prev=
+ else
+ if test "x$word" = "x-arch"; then
+ prev=arch
+ fi
+ fi
+ done
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $gl_cv_c_multiarch = yes; then
+ APPLE_UNIVERSAL_BUILD=1
+ else
+ APPLE_UNIVERSAL_BUILD=0
+ fi
+
+
+
+ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
+if test "x$ac_cv_have_decl_alarm" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_working_stdint_h" >&5
-$as_echo "$gl_cv_header_working_stdint_h" >&6; }
- fi
- if test "$gl_cv_header_working_stdint_h" = yes; then
- STDINT_H=
- else
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ALARM $ac_have_decl
+_ACEOF
-for ac_header in sys/inttypes.h sys/bitypes.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
+if ${ac_cv_c_restrict+:} false; then :
$as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_cv_c_restrict=no
+ # The order here caters to the fact that C++ does not require restrict.
+ for ac_kw in __restrict __restrict__ _Restrict restrict; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
+typedef int *int_ptr;
+ int foo (int_ptr $ac_kw ip) { return ip[0]; }
+ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
+ int bar (int ip[$ac_kw]) { return ip[0]; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+int
+main ()
+{
+int s[1];
+ int *$ac_kw t = s;
+ t[0] = 0;
+ return foo (t) + bar (t);
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
+ ;
+ return 0;
+}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_restrict=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$ac_cv_c_restrict" != no && break
+ done
- ac_header_preproc=no
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+$as_echo "$ac_cv_c_restrict" >&6; }
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+ case $ac_cv_c_restrict in
+ restrict) ;;
+ no) $as_echo "#define restrict /**/" >>confdefs.h
+ ;;
+ *) cat >>confdefs.h <<_ACEOF
+#define restrict $ac_cv_c_restrict
+_ACEOF
+ ;;
+ esac
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_header in stdlib.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDLIB_H 1
_ACEOF
fi
done
- if test $ac_cv_header_sys_inttypes_h = yes; then
- HAVE_SYS_INTTYPES_H=1
- else
- HAVE_SYS_INTTYPES_H=0
- fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ ac_cv_func_malloc_0_nonnull=no
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
- if test $ac_cv_header_sys_bitypes_h = yes; then
- HAVE_SYS_BITYPES_H=1
- else
- HAVE_SYS_BITYPES_H=0
- fi
+int
+main ()
+{
+return ! malloc (0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_func_malloc_0_nonnull=yes
+else
+ ac_cv_func_malloc_0_nonnull=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
+ gl_cv_func_malloc_0_nonnull=1
+else
+ gl_cv_func_malloc_0_nonnull=0
+fi
+cat >>confdefs.h <<_ACEOF
+#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull
+_ACEOF
- if test $APPLE_UNIVERSAL_BUILD = 0; then
- for gltype in ptrdiff_t size_t ; do
- { $as_echo "$as_me:$LINENO: checking for bit size of $gltype" >&5
-$as_echo_n "checking for bit size of $gltype... " >&6; }
-if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if ${ac_cv_header_stdbool_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
-
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= 0)];
-test_array [0] = 0
+ #include <stdbool.h>
+ #ifndef bool
+ "error: bool is not defined"
+ #endif
+ #ifndef false
+ "error: false is not defined"
+ #endif
+ #if false
+ "error: false is not 0"
+ #endif
+ #ifndef true
+ "error: true is not defined"
+ #endif
+ #if true != 1
+ "error: true is not 1"
+ #endif
+ #ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+ #endif
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ struct s { _Bool s: 1; _Bool t; } s;
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
+ char a[true == 1 ? 1 : -1];
+ char b[false == 0 ? 1 : -1];
+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+ char d[(bool) 0.5 == true ? 1 : -1];
+ /* See body of main program for 'e'. */
+ char f[(_Bool) 0.0 == false ? 1 : -1];
+ char g[true];
+ char h[sizeof (_Bool)];
+ char i[sizeof s.t];
+ enum { j = false, k = true, l = false * true, m = true * 256 };
+ /* The following fails for
+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+ _Bool n[m];
+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+ /* Catch a bug in an HP-UX C compiler. See
+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+ */
+ _Bool q = true;
+ _Bool *pq = &q;
-#include <limits.h>
int
main ()
{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
-test_array [0] = 0
+
+ bool e = &s;
+ *pq |= q;
+ *pq |= ! q;
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ + !m + !n + !o + !p + !q + !pq);
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdbool_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
+ ac_cv_header_stdbool_h=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = xyes; then :
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define HAVE__BOOL 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
-#include <limits.h>
+fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
+$as_echo_n "checking for unsigned long long int... " >&6; }
+if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_unsigned_long_long_int=yes
+ if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ /* For now, do not test the preprocessor; as of 2007 there are too many
+ implementations with broken preprocessors. Perhaps this can
+ be revisited in 2012. In the meantime, code should not expect
+ #if to work with literals wider than 32 bits. */
+ /* Test literals. */
+ long long int ll = 9223372036854775807ll;
+ long long int nll = -9223372036854775807LL;
+ unsigned long long int ull = 18446744073709551615ULL;
+ /* Test constant expressions. */
+ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+ ? 1 : -1)];
+ typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+ ? 1 : -1)];
+ int i = 63;
int
main ()
{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) < 0)];
-test_array [0] = 0
-
+/* Test availability of runtime routines for shift and division. */
+ long long int llmax = 9223372036854775807ll;
+ unsigned long long int ullmax = 18446744073709551615ull;
+ return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+ | (llmax / ll) | (llmax % ll)
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));
;
return 0;
}
+
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+if ac_fn_c_try_link "$LINENO"; then :
+
+else
+ ac_cv_type_unsigned_long_long_int=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
+$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
+ if test $ac_cv_type_unsigned_long_long_int = yes; then
+
+$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+
+ fi
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
+$as_echo_n "checking for long long int... " >&6; }
+if ${ac_cv_type_long_long_int+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_long_long_int=yes
+ if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+ ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+ if test $ac_cv_type_long_long_int = yes; then
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
#include <limits.h>
+ #ifndef LLONG_MAX
+ # define HALF \
+ (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+ # define LLONG_MAX (HALF - 1 + HALF)
+ #endif
int
main ()
{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= $ac_mid)];
-test_array [0] = 0
-
+long long int n = 1;
+ int i;
+ for (i = 0; ; i++)
+ {
+ long long int m = n << i;
+ if (m >> i != n)
+ return 1;
+ if (LLONG_MAX / 2 < m)
+ break;
+ }
+ return 0;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
+if ac_fn_c_try_run "$LINENO"; then :
+
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_type_long_long_int=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ fi
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
+$as_echo "$ac_cv_type_long_long_int" >&6; }
+ if test $ac_cv_type_long_long_int = yes; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
- ac_lo= ac_hi=
-fi
+ fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) result=$ac_lo;;
-'') result=unknown ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
+ if test $ac_cv_type_long_long_int = yes; then
+ HAVE_LONG_LONG_INT=1
+ else
+ HAVE_LONG_LONG_INT=0
+ fi
+
+
+ if test $ac_cv_type_unsigned_long_long_int = yes; then
+ HAVE_UNSIGNED_LONG_LONG_INT=1
+ else
+ HAVE_UNSIGNED_LONG_LONG_INT=0
+ fi
+
+
+
+ if test $ac_cv_header_wchar_h = yes; then
+ HAVE_WCHAR_H=1
+ else
+ HAVE_WCHAR_H=0
+ fi
+
+
+ if test $ac_cv_header_inttypes_h = yes; then
+ HAVE_INTTYPES_H=1
+ else
+ HAVE_INTTYPES_H=0
+ fi
+
+
+ if test $ac_cv_header_sys_types_h = yes; then
+ HAVE_SYS_TYPES_H=1
+ else
+ HAVE_SYS_TYPES_H=0
+ fi
+
+
+
-#include <limits.h>
-static long int longval () { return sizeof ($gltype) * CHAR_BIT; }
-static unsigned long int ulongval () { return sizeof ($gltype) * CHAR_BIT; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if ((sizeof ($gltype) * CHAR_BIT) < 0)
- {
- long int i = longval ();
- if (i != (sizeof ($gltype) * CHAR_BIT))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != (sizeof ($gltype) * CHAR_BIT))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- result=`cat conftest.val`
+
+
+
+
+
+ if test $gl_cv_have_include_next = yes; then
+ gl_cv_next_stdint_h='<'stdint.h'>'
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
+if ${gl_cv_next_stdint_h+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-result=unknown
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
- eval gl_cv_bitsizeof_${gltype}=\$result
+ if test $ac_cv_header_stdint_h = yes; then
-fi
-ac_res=`eval 'as_val=${'gl_cv_bitsizeof_${gltype}'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval result=\$gl_cv_bitsizeof_${gltype}
- if test $result = unknown; then
- result=0
- fi
- GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
- cat >>confdefs.h <<_ACEOF
-#define BITSIZEOF_${GLTYPE} $result
+
+
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdint.h>
_ACEOF
+ case "$host_os" in
+ aix*) gl_absname_cpp="$ac_cpp -C" ;;
+ *) gl_absname_cpp="$ac_cpp" ;;
+ esac
- eval BITSIZEOF_${GLTYPE}=\$result
- done
+ case "$host_os" in
+ mingw*)
+ gl_dirsep_regex='[/\\]'
+ ;;
+ *)
+ gl_dirsep_regex='\/'
+ ;;
+ esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+ gl_header_literal_regex=`echo 'stdint.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
+ p
+ q
+ }'
+
+ gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+ sed -n "$gl_absolute_header_sed"`
+ gl_header=$gl_cv_absolute_stdint_h
+ gl_cv_next_stdint_h='"'$gl_header'"'
+ else
+ gl_cv_next_stdint_h='<'stdint.h'>'
+ fi
- fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+$as_echo "$gl_cv_next_stdint_h" >&6; }
+ fi
+ NEXT_STDINT_H=$gl_cv_next_stdint_h
+
+ if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+ gl_next_as_first_directive='<'stdint.h'>'
+ else
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+ gl_next_as_first_directive=$gl_cv_next_stdint_h
+ fi
+ NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
+ if test $ac_cv_header_stdint_h = yes; then
+ HAVE_STDINT_H=1
+ else
+ HAVE_STDINT_H=0
+ fi
+
- for gltype in sig_atomic_t wchar_t wint_t ; do
- { $as_echo "$as_me:$LINENO: checking for bit size of $gltype" >&5
-$as_echo_n "checking for bit size of $gltype... " >&6; }
-if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then
+ if test $ac_cv_header_stdint_h = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
+if ${gl_cv_header_working_stdint_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ gl_cv_header_working_stdint_h=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>. */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
+
+
/* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
included before <wchar.h>. */
#include <stddef.h>
@@ -29511,156 +21889,159 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <wchar.h>
#endif
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+ ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MAXIMUM(t) \
+ ((t) ((t) 0 < (t) -1 \
+ ? (t) -1 \
+ : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+struct s {
+ int check_PTRDIFF:
+ PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+ && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+ ? 1 : -1;
+ /* Detect bug in FreeBSD 6.0 / ia64. */
+ int check_SIG_ATOMIC:
+ SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+ && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+ ? 1 : -1;
+ int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+ int check_WCHAR:
+ WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+ && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+ ? 1 : -1;
+ /* Detect bug in mingw. */
+ int check_WINT:
+ WINT_MIN == TYPE_MINIMUM (wint_t)
+ && WINT_MAX == TYPE_MAXIMUM (wint_t)
+ ? 1 : -1;
+
+ /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others. */
+ int check_UINT8_C:
+ (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+ int check_UINT16_C:
+ (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
+ /* Detect bugs in OpenBSD 3.9 stdint.h. */
+#ifdef UINT8_MAX
+ int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+ int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+ int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+ int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+ int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+ int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+ int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+ int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+ int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+ int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+ int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+ int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+ int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+ int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+ int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
-#include <limits.h>
int
main ()
{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
-test_array [0] = 0
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
+if ac_fn_c_try_compile "$LINENO"; then :
+ if test "$cross_compiling" = yes; then :
+ gl_cv_header_working_stdint_h=yes
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
- #include <stddef.h>
- #include <signal.h>
- #if HAVE_WCHAR_H
- # include <stdio.h>
- # include <time.h>
- # include <wchar.h>
- #endif
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) < 0)];
-test_array [0] = 0
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
/* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
included before <wchar.h>. */
@@ -29672,71 +22053,119 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <wchar.h>
#endif
-#include <limits.h>
+
+#include <stdio.h>
+#include <string.h>
+#define MVAL(macro) MVAL1(macro)
+#define MVAL1(expression) #expression
+static const char *macro_values[] =
+ {
+#ifdef INT8_MAX
+ MVAL (INT8_MAX),
+#endif
+#ifdef INT16_MAX
+ MVAL (INT16_MAX),
+#endif
+#ifdef INT32_MAX
+ MVAL (INT32_MAX),
+#endif
+#ifdef INT64_MAX
+ MVAL (INT64_MAX),
+#endif
+#ifdef UINT8_MAX
+ MVAL (UINT8_MAX),
+#endif
+#ifdef UINT16_MAX
+ MVAL (UINT16_MAX),
+#endif
+#ifdef UINT32_MAX
+ MVAL (UINT32_MAX),
+#endif
+#ifdef UINT64_MAX
+ MVAL (UINT64_MAX),
+#endif
+ NULL
+ };
+
int
main ()
{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= $ac_mid)];
-test_array [0] = 0
+
+ const char **mv;
+ for (mv = macro_values; *mv != NULL; mv++)
+ {
+ const char *value = *mv;
+ /* Test whether it looks like a cast expression. */
+ if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
+ || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
+ || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
+ || strncmp (value, "((int)"/*)*/, 6) == 0
+ || strncmp (value, "((signed short)"/*)*/, 15) == 0
+ || strncmp (value, "((signed char)"/*)*/, 14) == 0)
+ return mv - macro_values + 1;
+ }
+ return 0;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+if ac_fn_c_try_run "$LINENO"; then :
+ gl_cv_header_working_stdint_h=yes
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo= ac_hi=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+$as_echo "$gl_cv_header_working_stdint_h" >&6; }
+ fi
+ if test "$gl_cv_header_working_stdint_h" = yes; then
+ STDINT_H=
+ else
+ for ac_header in sys/inttypes.h sys/bitypes.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+done
+
+ if test $ac_cv_header_sys_inttypes_h = yes; then
+ HAVE_SYS_INTTYPES_H=1
+ else
+ HAVE_SYS_INTTYPES_H=0
+ fi
+
+ if test $ac_cv_header_sys_bitypes_h = yes; then
+ HAVE_SYS_BITYPES_H=1
+ else
+ HAVE_SYS_BITYPES_H=0
+ fi
+
+
+
+
+ if test $APPLE_UNIVERSAL_BUILD = 0; then
+
+ for gltype in ptrdiff_t size_t ; do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" "
/* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
included before <wchar.h>. */
#include <stddef.h>
@@ -29747,57 +22176,41 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <wchar.h>
#endif
-#include <limits.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
-test_array [0] = 0
+#include <limits.h>"; then :
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ result=unknown
+fi
+
+ eval gl_cv_bitsizeof_${gltype}=\$result
+
+fi
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval result=\$gl_cv_bitsizeof_${gltype}
+ if test $result = unknown; then
+ result=0
+ fi
+ GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+ cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
+ eval BITSIZEOF_${GLTYPE}=\$result
+ done
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) result=$ac_lo;;
-'') result=unknown ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ fi
+
+
+ for gltype in sig_atomic_t wchar_t wint_t ; do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" "
/* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
included before <wchar.h>. */
#include <stddef.h>
@@ -29808,81 +22221,17 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <wchar.h>
#endif
-#include <limits.h>
-static long int longval () { return sizeof ($gltype) * CHAR_BIT; }
-static unsigned long int ulongval () { return sizeof ($gltype) * CHAR_BIT; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if ((sizeof ($gltype) * CHAR_BIT) < 0)
- {
- long int i = longval ();
- if (i != (sizeof ($gltype) * CHAR_BIT))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != (sizeof ($gltype) * CHAR_BIT))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
+#include <limits.h>"; then :
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- result=`cat conftest.val`
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=unknown
+ result=unknown
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
eval gl_cv_bitsizeof_${gltype}=\$result
fi
-ac_res=`eval 'as_val=${'gl_cv_bitsizeof_${gltype}'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$gl_cv_bitsizeof_${gltype}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
eval result=\$gl_cv_bitsizeof_${gltype}
if test $result = unknown; then
@@ -29899,20 +22248,13 @@ _ACEOF
-
-
-
for gltype in sig_atomic_t wchar_t wint_t ; do
- { $as_echo "$as_me:$LINENO: checking whether $gltype is signed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
$as_echo_n "checking whether $gltype is signed... " >&6; }
-if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${gl_cv_type_${gltype}_signed+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -29934,39 +22276,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
result=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- result=no
+ result=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
eval gl_cv_type_${gltype}_signed=\$result
fi
-ac_res=`eval 'as_val=${'gl_cv_type_${gltype}_signed'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$gl_cv_type_${gltype}_signed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
eval result=\$gl_cv_type_${gltype}_signed
GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
@@ -29987,12 +22307,10 @@ _ACEOF
if test $APPLE_UNIVERSAL_BUILD = 0; then
-
-
for gltype in ptrdiff_t size_t ; do
- { $as_echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
$as_echo_n "(cached) " >&6
else
eval gl_cv_type_${gltype}_suffix=no
@@ -30013,11 +22331,7 @@ else
ull) gltype1='unsigned long long int';;
ui64)gltype1='unsigned __int64';;
esac
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -30040,40 +22354,16 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval gl_cv_type_${gltype}_suffix=\$glsuf
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
eval result=\$gl_cv_type_${gltype}_suffix
test "$result" != no && break
done
fi
-ac_res=`eval 'as_val=${'gl_cv_type_${gltype}_suffix'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
eval result=\$gl_cv_type_${gltype}_suffix
@@ -30089,13 +22379,10 @@ _ACEOF
fi
-
-
-
for gltype in sig_atomic_t wchar_t wint_t ; do
- { $as_echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
$as_echo_n "(cached) " >&6
else
eval gl_cv_type_${gltype}_suffix=no
@@ -30116,11 +22403,7 @@ else
ull) gltype1='unsigned long long int';;
ui64)gltype1='unsigned __int64';;
esac
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -30130,284 +22413,74 @@ cat >>conftest.$ac_ext <<_ACEOF
#if HAVE_WCHAR_H
# include <stdio.h>
# include <time.h>
- # include <wchar.h>
- #endif
-
- extern $gltype foo;
- extern $gltype1 foo;
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval gl_cv_type_${gltype}_suffix=\$glsuf
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- eval result=\$gl_cv_type_${gltype}_suffix
- test "$result" != no && break
- done
-fi
-ac_res=`eval 'as_val=${'gl_cv_type_${gltype}_suffix'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
- eval result=\$gl_cv_type_${gltype}_suffix
- test "$result" = no && result=
- eval ${GLTYPE}_SUFFIX=\$result
- cat >>confdefs.h <<_ACEOF
-#define ${GLTYPE}_SUFFIX $result
-_ACEOF
-
- done
-
-
-
- if test $BITSIZEOF_WINT_T -lt 32; then
- BITSIZEOF_WINT_T=32
- fi
-
- STDINT_H=stdint.h
- fi
-
- if test -n "$STDINT_H"; then
- GL_GENERATE_STDINT_H_TRUE=
- GL_GENERATE_STDINT_H_FALSE='#'
-else
- GL_GENERATE_STDINT_H_TRUE='#'
- GL_GENERATE_STDINT_H_FALSE=
-fi
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
-$as_echo_n "checking for pid_t... " >&6; }
-if test "${ac_cv_type_pid_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_pid_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (pid_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((pid_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_pid_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
-$as_echo_n "checking for mode_t... " >&6; }
-if test "${ac_cv_type_mode_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_mode_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (mode_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
+ # include <wchar.h>
+ #endif
+
+ extern $gltype foo;
+ extern $gltype1 foo;
int
main ()
{
-if (sizeof ((mode_t)))
- return 0;
+
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval gl_cv_type_${gltype}_suffix=\$glsuf
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ eval result=\$gl_cv_type_${gltype}_suffix
+ test "$result" != no && break
+ done
+fi
+eval ac_res=\$gl_cv_type_${gltype}_suffix
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+ eval result=\$gl_cv_type_${gltype}_suffix
+ test "$result" = no && result=
+ eval ${GLTYPE}_SUFFIX=\$result
+ cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
+
+ done
+
+
+
+ if test $BITSIZEOF_WINT_T -lt 32; then
+ BITSIZEOF_WINT_T=32
+ fi
+
+ STDINT_H=stdint.h
+ fi
- ac_cv_type_mode_t=yes
+ if test -n "$STDINT_H"; then
+ GL_GENERATE_STDINT_H_TRUE=
+ GL_GENERATE_STDINT_H_FALSE='#'
+else
+ GL_GENERATE_STDINT_H_TRUE='#'
+ GL_GENERATE_STDINT_H_FALSE=
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-$as_echo "$ac_cv_type_mode_t" >&6; }
-if test "x$ac_cv_type_mode_t" = x""yes; then
- :
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = xyes; then :
+
else
cat >>confdefs.h <<_ACEOF
@@ -30435,19 +22508,15 @@ fi
if test $gl_cv_have_include_next = yes; then
gl_cv_next_sys_types_h='<'sys/types.h'>'
else
- { $as_echo "$as_me:$LINENO: checking absolute name of <sys/types.h>" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
$as_echo_n "checking absolute name of <sys/types.h>... " >&6; }
-if test "${gl_cv_next_sys_types_h+set}" = set; then
+if ${gl_cv_next_sys_types_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
_ACEOF
@@ -30482,7 +22551,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_sys_types_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
$as_echo "$gl_cv_next_sys_types_h" >&6; }
fi
NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
@@ -30636,11 +22705,6 @@ $as_echo "$gl_cv_next_sys_types_h" >&6; }
-
-
-
-
-
if test $ac_cv_header_features_h = yes; then
HAVE_FEATURES_H=1
else
@@ -30649,16 +22713,12 @@ $as_echo "$gl_cv_next_sys_types_h" >&6; }
- { $as_echo "$as_me:$LINENO: checking for wint_t" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
$as_echo_n "checking for wint_t... " >&6; }
-if test "${gt_cv_c_wint_t+set}" = set; then
+if ${gt_cv_c_wint_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -30678,41 +22738,18 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gt_cv_c_wint_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_wint_t=no
+ gt_cv_c_wint_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
$as_echo "$gt_cv_c_wint_t" >&6; }
if test $gt_cv_c_wint_t = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINT_T 1
-_ACEOF
+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
fi
@@ -30762,17 +22799,13 @@ fi
# Define an additional variable used in the Makefile substitution.
if test $ac_cv_working_alloca_h = yes; then
- { $as_echo "$as_me:$LINENO: checking for alloca as a compiler built-in" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca as a compiler built-in" >&5
$as_echo_n "checking for alloca as a compiler built-in... " >&6; }
-if test "${gl_cv_rpl_alloca+set}" = set; then
+if ${gl_cv_rpl_alloca+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined __GNUC__ || defined _AIX || defined _MSC_VER
@@ -30781,7 +22814,7 @@ cat >>conftest.$ac_ext <<_ACEOF
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Need own alloca" >/dev/null 2>&1; then
+ $EGREP "Need own alloca" >/dev/null 2>&1; then :
gl_cv_rpl_alloca=yes
else
gl_cv_rpl_alloca=no
@@ -30790,13 +22823,11 @@ rm -f conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_rpl_alloca" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5
$as_echo "$gl_cv_rpl_alloca" >&6; }
if test $gl_cv_rpl_alloca = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
ALLOCA_H=alloca.h
else
@@ -30821,11 +22852,6 @@ fi
-
-
-
-
-
if test $ac_cv_func_btowc = no; then
HAVE_BTOWC=0
else
@@ -30833,13 +22859,13 @@ fi
- { $as_echo "$as_me:$LINENO: checking whether btowc(0) is correct" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(0) is correct" >&5
$as_echo_n "checking whether btowc(0) is correct... " >&6; }
-if test "${gl_cv_func_btowc_nul+set}" = set; then
+if ${gl_cv_func_btowc_nul+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
case "$host_os" in
# Guess no on Cygwin.
@@ -30849,11 +22875,7 @@ else
esac
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
@@ -30872,50 +22894,23 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_btowc_nul=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_btowc_nul=no
+ gl_cv_func_btowc_nul=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_btowc_nul" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_nul" >&5
$as_echo "$gl_cv_func_btowc_nul" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether btowc(EOF) is correct" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(EOF) is correct" >&5
$as_echo_n "checking whether btowc(EOF) is correct... " >&6; }
-if test "${gl_cv_func_btowc_eof+set}" = set; then
+if ${gl_cv_func_btowc_eof+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -30926,14 +22921,10 @@ else
*) gl_cv_func_btowc_eof="guessing yes" ;;
esac
if test $LOCALE_FR != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -30956,46 +22947,19 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_btowc_eof=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_btowc_eof=no
+ gl_cv_func_btowc_eof=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_btowc_eof" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_eof" >&5
$as_echo "$gl_cv_func_btowc_eof" >&6; }
case "$gl_cv_func_btowc_nul" in
@@ -31034,158 +22998,17 @@ $as_echo "$gl_cv_func_btowc_eof" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define GNULIB_TEST_BTOWC 1
-_ACEOF
-
-
-
-
-
-for ac_header in byteswap.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_header in byteswap.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
+if test "x$ac_cv_header_byteswap_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_BYTESWAP_H 1
_ACEOF
BYTESWAP_H=''
@@ -31266,17 +23089,12 @@ fi
-
-
-
-
-
if test $gl_cv_have_include_next = yes; then
gl_cv_next_langinfo_h='<'langinfo.h'>'
else
- { $as_echo "$as_me:$LINENO: checking absolute name of <langinfo.h>" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <langinfo.h>" >&5
$as_echo_n "checking absolute name of <langinfo.h>... " >&6; }
-if test "${gl_cv_next_langinfo_h+set}" = set; then
+if ${gl_cv_next_langinfo_h+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -31285,11 +23103,7 @@ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
_ACEOF
@@ -31327,7 +23141,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_langinfo_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_langinfo_h" >&5
$as_echo "$gl_cv_next_langinfo_h" >&6; }
fi
NEXT_LANGINFO_H=$gl_cv_next_langinfo_h
@@ -31350,23 +23164,14 @@ $as_echo "$gl_cv_next_langinfo_h" >&6; }
HAVE_LANGINFO_ERA=0
HAVE_LANGINFO_YESEXPR=0
-
-
-
-
-
if test $ac_cv_header_langinfo_h = yes; then
HAVE_LANGINFO_H=1
- { $as_echo "$as_me:$LINENO: checking whether langinfo.h defines CODESET" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5
$as_echo_n "checking whether langinfo.h defines CODESET... " >&6; }
-if test "${gl_cv_header_langinfo_codeset+set}" = set; then
+if ${gl_cv_header_langinfo_codeset+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
int a = CODESET;
@@ -31379,50 +23184,25 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_header_langinfo_codeset=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_header_langinfo_codeset=no
+ gl_cv_header_langinfo_codeset=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_langinfo_codeset" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_codeset" >&5
$as_echo "$gl_cv_header_langinfo_codeset" >&6; }
if test $gl_cv_header_langinfo_codeset = yes; then
HAVE_LANGINFO_CODESET=1
fi
- { $as_echo "$as_me:$LINENO: checking whether langinfo.h defines T_FMT_AMPM" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines T_FMT_AMPM" >&5
$as_echo_n "checking whether langinfo.h defines T_FMT_AMPM... " >&6; }
-if test "${gl_cv_header_langinfo_t_fmt_ampm+set}" = set; then
+if ${gl_cv_header_langinfo_t_fmt_ampm+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
int a = T_FMT_AMPM;
@@ -31435,50 +23215,25 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_header_langinfo_t_fmt_ampm=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_header_langinfo_t_fmt_ampm=no
+ gl_cv_header_langinfo_t_fmt_ampm=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_langinfo_t_fmt_ampm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_t_fmt_ampm" >&5
$as_echo "$gl_cv_header_langinfo_t_fmt_ampm" >&6; }
if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
HAVE_LANGINFO_T_FMT_AMPM=1
fi
- { $as_echo "$as_me:$LINENO: checking whether langinfo.h defines ERA" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ERA" >&5
$as_echo_n "checking whether langinfo.h defines ERA... " >&6; }
-if test "${gl_cv_header_langinfo_era+set}" = set; then
+if ${gl_cv_header_langinfo_era+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
int a = ERA;
@@ -31491,50 +23246,25 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_header_langinfo_era=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_header_langinfo_era=no
+ gl_cv_header_langinfo_era=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_langinfo_era" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_era" >&5
$as_echo "$gl_cv_header_langinfo_era" >&6; }
if test $gl_cv_header_langinfo_era = yes; then
HAVE_LANGINFO_ERA=1
fi
- { $as_echo "$as_me:$LINENO: checking whether langinfo.h defines YESEXPR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines YESEXPR" >&5
$as_echo_n "checking whether langinfo.h defines YESEXPR... " >&6; }
-if test "${gl_cv_header_langinfo_yesexpr+set}" = set; then
+if ${gl_cv_header_langinfo_yesexpr+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
int a = YESEXPR;
@@ -31543,40 +23273,19 @@ int
main ()
{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_header_langinfo_yesexpr=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_header_langinfo_yesexpr=no
+ gl_cv_header_langinfo_yesexpr=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_langinfo_yesexpr" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_yesexpr" >&5
$as_echo "$gl_cv_header_langinfo_yesexpr" >&6; }
if test $gl_cv_header_langinfo_yesexpr = yes; then
HAVE_LANGINFO_YESEXPR=1
@@ -31591,19 +23300,14 @@ $as_echo "$gl_cv_header_langinfo_yesexpr" >&6; }
-
- for gl_func in nl_langinfo; do
+ for gl_func in nl_langinfo; do
as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${$as_gl_Symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
@@ -31616,48 +23320,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_gl_Symbol=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_gl_Symbol=no"
+ eval "$as_gl_Symbol=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_gl_Symbol
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- as_val=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
_ACEOF
eval ac_cv_have_decl_$gl_func=yes
fi
-
done
@@ -31669,9 +23348,6 @@ fi
-
-
-
LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
@@ -31685,23 +23361,17 @@ fi
case "$host_os" in
solaris*)
-cat >>confdefs.h <<\_ACEOF
-#define _LCONV_C99 1
-_ACEOF
+$as_echo "#define _LCONV_C99 1" >>confdefs.h
;;
esac
- { $as_echo "$as_me:$LINENO: checking whether locale.h conforms to POSIX:2001" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5
$as_echo_n "checking whether locale.h conforms to POSIX:2001... " >&6; }
-if test "${gl_cv_header_locale_h_posix2001+set}" = set; then
+if ${gl_cv_header_locale_h_posix2001+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
int x = LC_MESSAGES;
@@ -31714,55 +23384,25 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_header_locale_h_posix2001=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_header_locale_h_posix2001=no
+ gl_cv_header_locale_h_posix2001=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_locale_h_posix2001" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_h_posix2001" >&5
$as_echo "$gl_cv_header_locale_h_posix2001" >&6; }
-
-
-
-
-
if test $ac_cv_header_xlocale_h = yes; then
HAVE_XLOCALE_H=1
- { $as_echo "$as_me:$LINENO: checking whether locale.h defines locale_t" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5
$as_echo_n "checking whether locale.h defines locale_t... " >&6; }
-if test "${gl_cv_header_locale_has_locale_t+set}" = set; then
+if ${gl_cv_header_locale_has_locale_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
locale_t x;
@@ -31774,36 +23414,15 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_header_locale_has_locale_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_header_locale_has_locale_t=no
+ gl_cv_header_locale_has_locale_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_locale_has_locale_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5
$as_echo "$gl_cv_header_locale_has_locale_t" >&6; }
if test $gl_cv_header_locale_has_locale_t = yes; then
gl_cv_header_locale_h_needs_xlocale_h=no
@@ -31816,16 +23435,12 @@ $as_echo "$gl_cv_header_locale_has_locale_t" >&6; }
fi
- { $as_echo "$as_me:$LINENO: checking whether struct lconv is properly defined" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5
$as_echo_n "checking whether struct lconv is properly defined... " >&6; }
-if test "${gl_cv_sys_struct_lconv_ok+set}" = set; then
+if ${gl_cv_sys_struct_lconv_ok+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
struct lconv l;
@@ -31839,36 +23454,15 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_sys_struct_lconv_ok=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_sys_struct_lconv_ok=no
+ gl_cv_sys_struct_lconv_ok=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_sys_struct_lconv_ok" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5
$as_echo "$gl_cv_sys_struct_lconv_ok" >&6; }
if test $gl_cv_sys_struct_lconv_ok = no; then
REPLACE_STRUCT_LCONV=1
@@ -31885,19 +23479,15 @@ $as_echo "$gl_cv_sys_struct_lconv_ok" >&6; }
if test $gl_cv_have_include_next = yes; then
gl_cv_next_locale_h='<'locale.h'>'
else
- { $as_echo "$as_me:$LINENO: checking absolute name of <locale.h>" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <locale.h>" >&5
$as_echo_n "checking absolute name of <locale.h>... " >&6; }
-if test "${gl_cv_next_locale_h+set}" = set; then
+if ${gl_cv_next_locale_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
_ACEOF
@@ -31932,7 +23522,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_locale_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5
$as_echo "$gl_cv_next_locale_h" >&6; }
fi
NEXT_LOCALE_H=$gl_cv_next_locale_h
@@ -31951,20 +23541,14 @@ $as_echo "$gl_cv_next_locale_h" >&6; }
-
-
- for gl_func in setlocale duplocale; do
+ for gl_func in setlocale duplocale; do
as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${$as_gl_Symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
/* Some systems provide declarations in a non-standard header. */
@@ -31981,48 +23565,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_gl_Symbol=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_gl_Symbol=no"
+ eval "$as_gl_Symbol=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_gl_Symbol
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- as_val=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
_ACEOF
eval ac_cv_have_decl_$gl_func=yes
fi
-
done
@@ -32046,104 +23605,9 @@ fi
gl_LIBOBJS="$gl_LIBOBJS localeconv.$ac_objext"
- { $as_echo "$as_me:$LINENO: checking for struct lconv.decimal_point" >&5
-$as_echo_n "checking for struct lconv.decimal_point... " >&6; }
-if test "${ac_cv_member_struct_lconv_decimal_point+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <locale.h>
-
-int
-main ()
-{
-static struct lconv ac_aggr;
-if (ac_aggr.decimal_point)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_lconv_decimal_point=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <locale.h>
-
-int
-main ()
-{
-static struct lconv ac_aggr;
-if (sizeof ac_aggr.decimal_point)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_lconv_decimal_point=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_lconv_decimal_point=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_lconv_decimal_point" >&5
-$as_echo "$ac_cv_member_struct_lconv_decimal_point" >&6; }
-if test "x$ac_cv_member_struct_lconv_decimal_point" = x""yes; then
+ ac_fn_c_check_member "$LINENO" "struct lconv" "decimal_point" "ac_cv_member_struct_lconv_decimal_point" "#include <locale.h>
+"
+if test "x$ac_cv_member_struct_lconv_decimal_point" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_LCONV_DECIMAL_POINT 1
@@ -32165,9 +23629,7 @@ fi
-cat >>confdefs.h <<\_ACEOF
-#define GNULIB_TEST_LOCALECONV 1
-_ACEOF
+$as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h
@@ -32176,119 +23638,19 @@ _ACEOF
if test "$gl_threads_api" = posix; then
# OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
# pthread_rwlock_* functions.
- { $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
-$as_echo_n "checking for pthread_rwlock_t... " >&6; }
-if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_pthread_rwlock_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-
-int
-main ()
-{
-if (sizeof (pthread_rwlock_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-
-int
-main ()
-{
-if (sizeof ((pthread_rwlock_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_pthread_rwlock_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5
-$as_echo "$ac_cv_type_pthread_rwlock_t" >&6; }
-if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then
+ ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
+"
+if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_RWLOCK 1
-_ACEOF
+$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
fi
# glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <pthread.h>
+
+ #include <pthread.h>
int
main ()
{
@@ -32307,36 +23669,11 @@ return !x;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-_ACEOF
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
+$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
:
@@ -32358,23 +23695,13 @@ _ACEOF
-
-
-
-
-
-
-
-
-
-
if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles incomplete characters" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then
+if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -32385,14 +23712,10 @@ else
*) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
esac
if test $LOCALE_JA != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -32412,63 +23735,36 @@ int main ()
const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
mbstate_t state;
wchar_t wc;
-
- memset (&state, '\0', sizeof (mbstate_t));
- if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
- if (mbsinit (&state))
- return 1;
- }
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+
+ memset (&state, '\0', sizeof (mbstate_t));
+ if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+ if (mbsinit (&state))
+ return 1;
+ }
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_incomplete_state=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_incomplete_state=no
+ gl_cv_func_mbrtowc_incomplete_state=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc works as well as mbtowc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then
+if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -32479,14 +23775,10 @@ else
*) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
esac
if test $LOCALE_ZH_CN != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -32519,46 +23811,19 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_sanitycheck=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_sanitycheck=no
+ gl_cv_func_mbrtowc_sanitycheck=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
REPLACE_MBSTATE_T=0
@@ -32576,25 +23841,9 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
-
-
-
-
-
if test $ac_cv_func_mbrtowc = no; then
HAVE_MBRTOWC=0
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc is declared" >&5
-$as_echo_n "checking whether mbrtowc is declared... " >&6; }
-if test "${ac_cv_have_decl_mbrtowc+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+ ac_fn_c_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" "
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
<wchar.h>.
BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -32604,64 +23853,17 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <time.h>
#include <wchar.h>
-
-int
-main ()
-{
-#ifndef mbrtowc
- (void) mbrtowc;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_mbrtowc=yes
+"
+if test "x$ac_cv_have_decl_mbrtowc" = xyes; then :
+ ac_have_decl=1
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_mbrtowc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_have_decl=0
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_mbrtowc" >&5
-$as_echo "$ac_cv_have_decl_mbrtowc" >&6; }
-if test "x$ac_cv_have_decl_mbrtowc" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBRTOWC 1
-_ACEOF
-
-
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBRTOWC 0
+#define HAVE_DECL_MBRTOWC $ac_have_decl
_ACEOF
-
-fi
-
-
if test $ac_cv_have_decl_mbrtowc = yes; then
REPLACE_MBRTOWC=1
fi
@@ -32672,9 +23874,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles a NULL pwc argument" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5
$as_echo_n "checking whether mbrtowc handles a NULL pwc argument... " >&6; }
-if test "${gl_cv_func_mbrtowc_null_arg1+set}" = set; then
+if ${gl_cv_func_mbrtowc_null_arg1+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -32685,14 +23887,10 @@ else
*) gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
esac
if test $LOCALE_FR_UTF8 != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -32735,54 +23933,27 @@ int main ()
return result;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_null_arg1=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_null_arg1=no
+ gl_cv_func_mbrtowc_null_arg1=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_null_arg1" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5
$as_echo "$gl_cv_func_mbrtowc_null_arg1" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles a NULL string argument" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
$as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
-if test "${gl_cv_func_mbrtowc_null_arg2+set}" = set; then
+if ${gl_cv_func_mbrtowc_null_arg2+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -32793,14 +23964,10 @@ else
*) gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
esac
if test $LOCALE_FR_UTF8 != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -32831,46 +23998,19 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_null_arg2=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_null_arg2=no
+ gl_cv_func_mbrtowc_null_arg2=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_null_arg2" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5
$as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; }
@@ -32878,9 +24018,9 @@ $as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc has a correct return value" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
$as_echo_n "checking whether mbrtowc has a correct return value... " >&6; }
-if test "${gl_cv_func_mbrtowc_retval+set}" = set; then
+if ${gl_cv_func_mbrtowc_retval+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -32892,14 +24032,10 @@ else
esac
if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
|| { case "$host_os" in mingw*) true;; *) false;; esac; }; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -32997,57 +24133,30 @@ int main ()
return (found_some_locale ? result : 77);
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_retval=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test $? != 77; then
+ if test $? != 77; then
gl_cv_func_mbrtowc_retval=no
fi
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_retval" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5
$as_echo "$gl_cv_func_mbrtowc_retval" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
$as_echo_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
-if test "${gl_cv_func_mbrtowc_nul_retval+set}" = set; then
+if ${gl_cv_func_mbrtowc_nul_retval+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -33058,14 +24167,10 @@ else
*) gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
esac
if test $LOCALE_ZH_CN != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -33093,53 +24198,26 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_nul_retval=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_nul_retval=no
+ gl_cv_func_mbrtowc_nul_retval=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_nul_retval" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
$as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc works on empty input" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
$as_echo_n "checking whether mbrtowc works on empty input... " >&6; }
-if test "${gl_cv_func_mbrtowc_empty_input+set}" = set; then
+if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -33149,14 +24227,10 @@ else
gl_cv_func_mbrtowc_empty_input="guessing no" ;;
*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
esac
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <wchar.h>
@@ -33168,53 +24242,24 @@ cat >>conftest.$ac_ext <<_ACEOF
return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_empty_input=no
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_empty_input=yes
+ gl_cv_func_mbrtowc_empty_input=yes
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_empty_input" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
$as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
case "$gl_cv_func_mbrtowc_null_arg1" in
*yes) ;;
*)
-cat >>confdefs.h <<\_ACEOF
-#define MBRTOWC_NULL_ARG1_BUG 1
-_ACEOF
+$as_echo "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
REPLACE_MBRTOWC=1
;;
@@ -33222,9 +24267,7 @@ _ACEOF
case "$gl_cv_func_mbrtowc_null_arg2" in
*yes) ;;
*)
-cat >>confdefs.h <<\_ACEOF
-#define MBRTOWC_NULL_ARG2_BUG 1
-_ACEOF
+$as_echo "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
REPLACE_MBRTOWC=1
;;
@@ -33232,9 +24275,7 @@ _ACEOF
case "$gl_cv_func_mbrtowc_retval" in
*yes) ;;
*)
-cat >>confdefs.h <<\_ACEOF
-#define MBRTOWC_RETVAL_BUG 1
-_ACEOF
+$as_echo "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
REPLACE_MBRTOWC=1
;;
@@ -33242,9 +24283,7 @@ _ACEOF
case "$gl_cv_func_mbrtowc_nul_retval" in
*yes) ;;
*)
-cat >>confdefs.h <<\_ACEOF
-#define MBRTOWC_NUL_RETVAL_BUG 1
-_ACEOF
+$as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
REPLACE_MBRTOWC=1
;;
@@ -33252,9 +24291,7 @@ _ACEOF
case "$gl_cv_func_mbrtowc_empty_input" in
*yes) ;;
*)
-cat >>confdefs.h <<\_ACEOF
-#define MBRTOWC_EMPTY_INPUT_BUG 1
-_ACEOF
+$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
REPLACE_MBRTOWC=1
;;
@@ -33288,19 +24325,7 @@ _ACEOF
-cat >>confdefs.h <<\_ACEOF
-#define GNULIB_TEST_MBRTOWC 1
-_ACEOF
-
-
-
-
-
-
-
-
-
-
+$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
@@ -33319,9 +24344,9 @@ _ACEOF
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles incomplete characters" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then
+if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -33332,14 +24357,10 @@ else
*) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
esac
if test $LOCALE_JA != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -33368,54 +24389,27 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_incomplete_state=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_incomplete_state=no
+ gl_cv_func_mbrtowc_incomplete_state=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc works as well as mbtowc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then
+if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -33426,14 +24420,10 @@ else
*) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
esac
if test $LOCALE_ZH_CN != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -33466,46 +24456,19 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_sanitycheck=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_sanitycheck=no
+ gl_cv_func_mbrtowc_sanitycheck=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
REPLACE_MBSTATE_T=0
@@ -33523,25 +24486,9 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
-
-
-
-
-
if test $ac_cv_func_mbsinit = no; then
HAVE_MBSINIT=0
- { $as_echo "$as_me:$LINENO: checking whether mbsinit is declared" >&5
-$as_echo_n "checking whether mbsinit is declared... " >&6; }
-if test "${ac_cv_have_decl_mbsinit+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+ ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
<wchar.h>.
BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -33551,63 +24498,16 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <time.h>
#include <wchar.h>
-
-int
-main ()
-{
-#ifndef mbsinit
- (void) mbsinit;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_mbsinit=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_mbsinit=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_mbsinit" >&5
-$as_echo "$ac_cv_have_decl_mbsinit" >&6; }
-if test "x$ac_cv_have_decl_mbsinit" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBSINIT 1
-_ACEOF
-
-
+"
+if test "x$ac_cv_have_decl_mbsinit" = xyes; then :
+ ac_have_decl=1
else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBSINIT 0
-_ACEOF
-
-
+ ac_have_decl=0
fi
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MBSINIT $ac_have_decl
+_ACEOF
if test $ac_cv_have_decl_mbsinit = yes; then
REPLACE_MBSINIT=1
@@ -33648,9 +24548,7 @@ fi
-cat >>confdefs.h <<\_ACEOF
-#define GNULIB_TEST_MBSINIT 1
-_ACEOF
+$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
@@ -33687,14 +24585,7 @@ _ACEOF
-cat >>confdefs.h <<\_ACEOF
-#define GNULIB_TEST_MBTOWC 1
-_ACEOF
-
-
-
-
-
+$as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
@@ -33705,12 +24596,12 @@ _ACEOF
if test $ac_cv_func_nl_langinfo = yes; then
# On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken.
- { $as_echo "$as_me:$LINENO: checking whether YESEXPR works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether YESEXPR works" >&5
$as_echo_n "checking whether YESEXPR works... " >&6; }
-if test "${gl_cv_func_nl_langinfo_yesexpr_works+set}" = set; then
+if ${gl_cv_func_nl_langinfo_yesexpr_works+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
case "$host_os" in
# Guess no on irix systems.
@@ -33720,11 +24611,7 @@ else
esac
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
@@ -33737,45 +24624,18 @@ return !*nl_langinfo(YESEXPR);
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_nl_langinfo_yesexpr_works=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_nl_langinfo_yesexpr_works=no
+ gl_cv_func_nl_langinfo_yesexpr_works=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_nl_langinfo_yesexpr_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_nl_langinfo_yesexpr_works" >&5
$as_echo "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; }
case $gl_cv_func_nl_langinfo_yesexpr_works in
*yes) FUNC_NL_LANGINFO_YESEXPR_WORKS=1 ;;
@@ -33792,9 +24652,7 @@ _ACEOF
else
REPLACE_NL_LANGINFO=1
-cat >>confdefs.h <<\_ACEOF
-#define REPLACE_NL_LANGINFO 1
-_ACEOF
+$as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h
fi
else
@@ -33824,16 +24682,14 @@ _ACEOF
-cat >>confdefs.h <<\_ACEOF
-#define GNULIB_TEST_NL_LANGINFO 1
-_ACEOF
+$as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h
# Check whether --with-included-regex was given.
-if test "${with_included_regex+set}" = set; then
+if test "${with_included_regex+set}" = set; then :
withval=$with_included_regex;
fi
@@ -33848,27 +24704,15 @@ fi
# regex.c.
-
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for working re_compile_pattern" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working re_compile_pattern" >&5
$as_echo_n "checking for working re_compile_pattern... " >&6; }
-if test "${gl_cv_func_re_compile_pattern_working+set}" = set; then
+if ${gl_cv_func_re_compile_pattern_working+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
gl_cv_func_re_compile_pattern_working=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <regex.h>
@@ -34068,141 +24912,78 @@ int result = 0;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_re_compile_pattern_working=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_re_compile_pattern_working=no
+ gl_cv_func_re_compile_pattern_working=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_re_compile_pattern_working" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_re_compile_pattern_working" >&5
$as_echo "$gl_cv_func_re_compile_pattern_working" >&6; }
case $gl_cv_func_re_compile_pattern_working in #(
yes) ac_use_included_regex=no;; #(
no) ac_use_included_regex=yes;;
esac
;;
- *) { { $as_echo "$as_me:$LINENO: error: Invalid value for --with-included-regex: $with_included_regex" >&5
-$as_echo "$as_me: error: Invalid value for --with-included-regex: $with_included_regex" >&2;}
- { (exit 1); exit 1; }; }
+ *) as_fn_error $? "Invalid value for --with-included-regex: $with_included_regex" "$LINENO" 5
;;
esac
if test $ac_use_included_regex = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define _REGEX_INCLUDE_LIMITS_H 1
-_ACEOF
+$as_echo "#define _REGEX_INCLUDE_LIMITS_H 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define _REGEX_LARGE_OFFSETS 1
-_ACEOF
+$as_echo "#define _REGEX_LARGE_OFFSETS 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_syntax_options rpl_re_syntax_options
-_ACEOF
+$as_echo "#define re_syntax_options rpl_re_syntax_options" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_set_syntax rpl_re_set_syntax
-_ACEOF
+$as_echo "#define re_set_syntax rpl_re_set_syntax" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_compile_pattern rpl_re_compile_pattern
-_ACEOF
+$as_echo "#define re_compile_pattern rpl_re_compile_pattern" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_compile_fastmap rpl_re_compile_fastmap
-_ACEOF
+$as_echo "#define re_compile_fastmap rpl_re_compile_fastmap" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_search rpl_re_search
-_ACEOF
+$as_echo "#define re_search rpl_re_search" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_search_2 rpl_re_search_2
-_ACEOF
+$as_echo "#define re_search_2 rpl_re_search_2" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_match rpl_re_match
-_ACEOF
+$as_echo "#define re_match rpl_re_match" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_match_2 rpl_re_match_2
-_ACEOF
+$as_echo "#define re_match_2 rpl_re_match_2" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_set_registers rpl_re_set_registers
-_ACEOF
+$as_echo "#define re_set_registers rpl_re_set_registers" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_comp rpl_re_comp
-_ACEOF
+$as_echo "#define re_comp rpl_re_comp" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define re_exec rpl_re_exec
-_ACEOF
+$as_echo "#define re_exec rpl_re_exec" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define regcomp rpl_regcomp
-_ACEOF
+$as_echo "#define regcomp rpl_regcomp" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define regexec rpl_regexec
-_ACEOF
+$as_echo "#define regexec rpl_regexec" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define regerror rpl_regerror
-_ACEOF
+$as_echo "#define regerror rpl_regerror" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define regfree rpl_regfree
-_ACEOF
+$as_echo "#define regfree rpl_regfree" >>confdefs.h
fi
@@ -34224,151 +25005,12 @@ _ACEOF
-
-for ac_header in libintl.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_header in libintl.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LIBINTL_H 1
_ACEOF
fi
@@ -34376,96 +25018,27 @@ fi
done
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking whether isblank is declared" >&5
-$as_echo_n "checking whether isblank is declared... " >&6; }
-if test "${ac_cv_have_decl_isblank+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-
-int
-main ()
-{
-#ifndef isblank
- (void) isblank;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_isblank=yes
+ ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h>
+"
+if test "x$ac_cv_have_decl_isblank" = xyes; then :
+ ac_have_decl=1
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_isblank=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_have_decl=0
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_isblank" >&5
-$as_echo "$ac_cv_have_decl_isblank" >&6; }
-if test "x$ac_cv_have_decl_isblank" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ISBLANK 1
+#define HAVE_DECL_ISBLANK $ac_have_decl
_ACEOF
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ISBLANK 0
-_ACEOF
-
-
-fi
-
-
-
fi
- { $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
$as_echo_n "checking for ssize_t... " >&6; }
-if test "${gt_cv_ssize_t+set}" = set; then
+if ${gt_cv_ssize_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
int
@@ -34477,41 +25050,18 @@ int x = sizeof (ssize_t *) + sizeof (ssize_t);
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gt_cv_ssize_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_ssize_t=no
+ gt_cv_ssize_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_ssize_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
$as_echo "$gt_cv_ssize_t" >&6; }
if test $gt_cv_ssize_t = no; then
-cat >>confdefs.h <<\_ACEOF
-#define ssize_t int
-_ACEOF
+$as_echo "#define ssize_t int" >>confdefs.h
fi
@@ -34545,107 +25095,12 @@ fi
- STDDEF_H=
- { $as_echo "$as_me:$LINENO: checking for max_align_t" >&5
-$as_echo_n "checking for max_align_t... " >&6; }
-if test "${ac_cv_type_max_align_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_max_align_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-
-
-int
-main ()
-{
-if (sizeof (max_align_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-
-
-int
-main ()
-{
-if (sizeof ((max_align_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_max_align_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_max_align_t" >&5
-$as_echo "$ac_cv_type_max_align_t" >&6; }
-if test "x$ac_cv_type_max_align_t" = x""yes; then
- :
+ STDDEF_H=
+ ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include <stddef.h>
+
+"
+if test "x$ac_cv_type_max_align_t" = xyes; then :
+
else
HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h
fi
@@ -34654,16 +25109,12 @@ fi
HAVE_WCHAR_T=0
STDDEF_H=stddef.h
fi
- { $as_echo "$as_me:$LINENO: checking whether NULL can be used in arbitrary expressions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if test "${gl_cv_decl_null_works+set}" = set; then
+if ${gl_cv_decl_null_works+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stddef.h>
int test[2 * (sizeof NULL == sizeof (void *)) -1];
@@ -34676,35 +25127,14 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_decl_null_works=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_decl_null_works=no
+ gl_cv_decl_null_works=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_decl_null_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
$as_echo "$gl_cv_decl_null_works" >&6; }
if test $gl_cv_decl_null_works = no; then
REPLACE_NULL=1
@@ -34731,19 +25161,15 @@ fi
if test $gl_cv_have_include_next = yes; then
gl_cv_next_stddef_h='<'stddef.h'>'
else
- { $as_echo "$as_me:$LINENO: checking absolute name of <stddef.h>" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if test "${gl_cv_next_stddef_h+set}" = set; then
+if ${gl_cv_next_stddef_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stddef.h>
_ACEOF
@@ -34778,7 +25204,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stddef_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
$as_echo "$gl_cv_next_stddef_h" >&6; }
fi
NEXT_STDDEF_H=$gl_cv_next_stddef_h
@@ -34811,19 +25237,15 @@ $as_echo "$gl_cv_next_stddef_h" >&6; }
if test $gl_cv_have_include_next = yes; then
gl_cv_next_stdlib_h='<'stdlib.h'>'
else
- { $as_echo "$as_me:$LINENO: checking absolute name of <stdlib.h>" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
$as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
-if test "${gl_cv_next_stdlib_h+set}" = set; then
+if ${gl_cv_next_stdlib_h+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
@@ -34858,7 +25280,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdlib_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
$as_echo "$gl_cv_next_stdlib_h" >&6; }
fi
NEXT_STDLIB_H=$gl_cv_next_stdlib_h
@@ -34877,49 +25299,14 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do
+ for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do
as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${$as_gl_Symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#if HAVE_SYS_LOADAVG_H
@@ -34938,98 +25325,27 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_gl_Symbol=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_gl_Symbol=no"
+ eval "$as_gl_Symbol=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_gl_Symbol
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- as_val=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
_ACEOF
eval ac_cv_have_decl_$gl_func=yes
fi
-
done
- { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
-done
-IFS=$as_save_IFS
-
-fi
-
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-
-
-
-
@@ -35050,9 +25366,9 @@ $as_echo "$MKDIR_P" >&6; }
if test $gl_cv_have_include_next = yes; then
gl_cv_next_unistd_h='<'unistd.h'>'
else
- { $as_echo "$as_me:$LINENO: checking absolute name of <unistd.h>" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
$as_echo_n "checking absolute name of <unistd.h>... " >&6; }
-if test "${gl_cv_next_unistd_h+set}" = set; then
+if ${gl_cv_next_unistd_h+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -35061,11 +25377,7 @@ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <unistd.h>
_ACEOF
@@ -35103,7 +25415,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_unistd_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
$as_echo "$gl_cv_next_unistd_h" >&6; }
fi
NEXT_UNISTD_H=$gl_cv_next_unistd_h
@@ -35132,63 +25444,14 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r unlink unlinkat usleep; do
+ for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r unlink unlinkat usleep; do
as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${$as_gl_Symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if HAVE_UNISTD_H
@@ -35213,48 +25476,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_gl_Symbol=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_gl_Symbol=no"
+ eval "$as_gl_Symbol=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_gl_Symbol
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- as_val=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
_ACEOF
eval ac_cv_have_decl_$gl_func=yes
fi
-
done
@@ -35270,17 +25508,12 @@ fi
-
-
-
-
-
if test $gl_cv_have_include_next = yes; then
gl_cv_next_wchar_h='<'wchar.h'>'
else
- { $as_echo "$as_me:$LINENO: checking absolute name of <wchar.h>" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
$as_echo_n "checking absolute name of <wchar.h>... " >&6; }
-if test "${gl_cv_next_wchar_h+set}" = set; then
+if ${gl_cv_next_wchar_h+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -35289,11 +25522,7 @@ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <wchar.h>
_ACEOF
@@ -35331,7 +25560,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wchar_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
$as_echo "$gl_cv_next_wchar_h" >&6; }
fi
NEXT_WCHAR_H=$gl_cv_next_wchar_h
@@ -35366,57 +25595,14 @@ $as_echo "$gl_cv_next_wchar_h" >&6; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth ; do
+ for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth ; do
as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${$as_gl_Symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -35439,48 +25625,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_gl_Symbol=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_gl_Symbol=no"
+ eval "$as_gl_Symbol=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_gl_Symbol
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- as_val=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
_ACEOF
eval ac_cv_have_decl_$gl_func=yes
fi
-
done
@@ -35494,23 +25655,13 @@ fi
-
-
-
-
-
-
-
-
-
-
if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles incomplete characters" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
$as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then
+if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -35521,14 +25672,10 @@ else
*) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
esac
if test $LOCALE_JA != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -35557,54 +25704,27 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_incomplete_state=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_incomplete_state=no
+ gl_cv_func_mbrtowc_incomplete_state=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
$as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether mbrtowc works as well as mbtowc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
$as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then
+if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -35615,14 +25735,10 @@ else
*) gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
esac
if test $LOCALE_ZH_CN != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -35655,46 +25771,19 @@ int main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_mbrtowc_sanitycheck=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_mbrtowc_sanitycheck=no
+ gl_cv_func_mbrtowc_sanitycheck=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
$as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
REPLACE_MBSTATE_T=0
@@ -35712,25 +25801,9 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
-
-
-
-
-
if test $ac_cv_func_wcrtomb = no; then
HAVE_WCRTOMB=0
- { $as_echo "$as_me:$LINENO: checking whether wcrtomb is declared" >&5
-$as_echo_n "checking whether wcrtomb is declared... " >&6; }
-if test "${ac_cv_have_decl_wcrtomb+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+ ac_fn_c_check_decl "$LINENO" "wcrtomb" "ac_cv_have_decl_wcrtomb" "
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
<wchar.h>.
BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -35740,64 +25813,17 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <time.h>
#include <wchar.h>
-
-int
-main ()
-{
-#ifndef wcrtomb
- (void) wcrtomb;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_wcrtomb=yes
+"
+if test "x$ac_cv_have_decl_wcrtomb" = xyes; then :
+ ac_have_decl=1
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_wcrtomb=no
+ ac_have_decl=0
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_wcrtomb" >&5
-$as_echo "$ac_cv_have_decl_wcrtomb" >&6; }
-if test "x$ac_cv_have_decl_wcrtomb" = x""yes; then
-
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_WCRTOMB 1
-_ACEOF
-
-
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_WCRTOMB 0
+#define HAVE_DECL_WCRTOMB $ac_have_decl
_ACEOF
-
-fi
-
-
if test $ac_cv_have_decl_wcrtomb = yes; then
REPLACE_WCRTOMB=1
fi
@@ -35810,9 +25836,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking whether wcrtomb return value is correct" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5
$as_echo_n "checking whether wcrtomb return value is correct... " >&6; }
-if test "${gl_cv_func_wcrtomb_retval+set}" = set; then
+if ${gl_cv_func_wcrtomb_retval+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -35823,14 +25849,10 @@ else
*) gl_cv_func_wcrtomb_retval="guessing yes" ;;
esac
if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
@@ -35869,46 +25891,19 @@ int main ()
return result;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_wcrtomb_retval=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_wcrtomb_retval=no
+ gl_cv_func_wcrtomb_retval=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_wcrtomb_retval" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_retval" >&5
$as_echo "$gl_cv_func_wcrtomb_retval" >&6; }
case "$gl_cv_func_wcrtomb_retval" in
*yes) ;;
@@ -35943,14 +25938,7 @@ $as_echo "$gl_cv_func_wcrtomb_retval" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define GNULIB_TEST_WCRTOMB 1
-_ACEOF
-
-
-
-
-
+$as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h
@@ -35983,17 +25971,12 @@ _ACEOF
-
-
-
-
-
if test $gl_cv_have_include_next = yes; then
gl_cv_next_wctype_h='<'wctype.h'>'
else
- { $as_echo "$as_me:$LINENO: checking absolute name of <wctype.h>" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
-if test "${gl_cv_next_wctype_h+set}" = set; then
+if ${gl_cv_next_wctype_h+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -36002,11 +25985,7 @@ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <wctype.h>
_ACEOF
@@ -36044,7 +26023,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wctype_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
$as_echo "$gl_cv_next_wctype_h" >&6; }
fi
NEXT_WCTYPE_H=$gl_cv_next_wctype_h
@@ -36063,18 +26042,14 @@ $as_echo "$gl_cv_next_wctype_h" >&6; }
if test $ac_cv_header_wctype_h = yes; then
if test $ac_cv_func_iswcntrl = yes; then
- { $as_echo "$as_me:$LINENO: checking whether iswcntrl works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
$as_echo_n "checking whether iswcntrl works... " >&6; }
-if test "${gl_cv_func_iswcntrl_works+set}" = set; then
+if ${gl_cv_func_iswcntrl_works+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test "$cross_compiling" = yes; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#if __GNU_LIBRARY__ == 1
@@ -36088,40 +26063,15 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_func_iswcntrl_works="guessing yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_func_iswcntrl_works="guessing no"
+ gl_cv_func_iswcntrl_works="guessing no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
@@ -36136,45 +26086,18 @@ cat >>conftest.$ac_ext <<_ACEOF
int main () { return iswprint ('x') == 0; }
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_iswcntrl_works=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gl_cv_func_iswcntrl_works=no
+ gl_cv_func_iswcntrl_works=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_iswcntrl_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
$as_echo "$gl_cv_func_iswcntrl_works" >&6; }
fi
HAVE_WCTYPE_H=1
@@ -36196,102 +26119,12 @@ $as_echo "$gl_cv_func_iswcntrl_works" >&6; }
if test $REPLACE_ISWCNTRL = 1; then
REPLACE_TOWLOWER=1
else
-
-for ac_func in towlower
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_func in towlower
+do :
+ ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower"
+if test "x$ac_cv_func_towlower" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_TOWLOWER 1
_ACEOF
fi
@@ -36300,18 +26133,7 @@ done
if test $ac_cv_func_towlower = yes; then
REPLACE_TOWLOWER=0
else
- { $as_echo "$as_me:$LINENO: checking whether towlower is declared" >&5
-$as_echo_n "checking whether towlower is declared... " >&6; }
-if test "${ac_cv_have_decl_towlower+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
+ ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
included before <wchar.h>.
BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h>
must be included before <wchar.h>. */
@@ -36323,64 +26145,17 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <wctype.h>
#endif
-
-int
-main ()
-{
-#ifndef towlower
- (void) towlower;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_towlower=yes
+"
+if test "x$ac_cv_have_decl_towlower" = xyes; then :
+ ac_have_decl=1
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_towlower=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_have_decl=0
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_towlower" >&5
-$as_echo "$ac_cv_have_decl_towlower" >&6; }
-if test "x$ac_cv_have_decl_towlower" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TOWLOWER 1
-_ACEOF
-
-
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TOWLOWER 0
+#define HAVE_DECL_TOWLOWER $ac_have_decl
_ACEOF
-
-fi
-
-
if test $ac_cv_have_decl_towlower = yes; then
REPLACE_TOWLOWER=1
else
@@ -36394,16 +26169,12 @@ fi
:
fi
- { $as_echo "$as_me:$LINENO: checking for wctype_t" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
$as_echo_n "checking for wctype_t... " >&6; }
-if test "${gl_cv_type_wctype_t+set}" = set; then
+if ${gl_cv_type_wctype_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
included before <wchar.h>.
@@ -36426,51 +26197,26 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_type_wctype_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_type_wctype_t=no
+ gl_cv_type_wctype_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_type_wctype_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
$as_echo "$gl_cv_type_wctype_t" >&6; }
if test $gl_cv_type_wctype_t = no; then
HAVE_WCTYPE_T=0
fi
- { $as_echo "$as_me:$LINENO: checking for wctrans_t" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
$as_echo_n "checking for wctrans_t... " >&6; }
-if test "${gl_cv_type_wctrans_t+set}" = set; then
+if ${gl_cv_type_wctrans_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
included before <wchar.h>.
@@ -36491,58 +26237,29 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_type_wctrans_t=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gl_cv_type_wctrans_t=no
+ gl_cv_type_wctrans_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_type_wctrans_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
$as_echo "$gl_cv_type_wctrans_t" >&6; }
if test $gl_cv_type_wctrans_t = no; then
HAVE_WCTRANS_T=0
fi
-
-
-
-
- for gl_func in wctype iswctype wctrans towctrans ; do
+ for gl_func in wctype iswctype wctrans towctrans ; do
as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${$as_gl_Symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -36564,50 +26281,25 @@ main ()
(void) $gl_func;
;
return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_gl_Symbol=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_gl_Symbol=no"
+ eval "$as_gl_Symbol=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_gl_Symbol
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- as_val=`eval 'as_val=${'$as_gl_Symbol'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
_ACEOF
eval ac_cv_have_decl_$gl_func=yes
fi
-
done
@@ -36649,7 +26341,7 @@ fi
# Check whether --with-curl was given.
-if test "${with_curl+set}" = set; then
+if test "${with_curl+set}" = set; then :
withval=$with_curl; with_curl_prefix="$withval"
else
with_curl_prefix=""
@@ -36663,7 +26355,7 @@ curl_set=
if test -n "$with_curl_prefix" -a -x $with_curl_prefix/bin/curl-config
then
- { $as_echo "$as_me:$LINENO: Using $with_curl_prefix as the curl prefix directory." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using $with_curl_prefix as the curl prefix directory." >&5
$as_echo "$as_me: Using $with_curl_prefix as the curl prefix directory." >&6;}
CURL_LIBS="`$with_curl_prefix/bin/curl-config --libs`"
CURL_STATIC_LIBS=$CURL_LIBS
@@ -36672,9 +26364,7 @@ $as_echo "$as_me: Using $with_curl_prefix as the curl prefix directory." >&6;}
curl_set="yes"
elif test -n "$with_curl_prefix"
then
- { { $as_echo "$as_me:$LINENO: error: You set the curl-prefix directory to $with_curl_prefix, but curl-config is not there." >&5
-$as_echo "$as_me: error: You set the curl-prefix directory to $with_curl_prefix, but curl-config is not there." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "You set the curl-prefix directory to $with_curl_prefix, but curl-config is not there." "$LINENO" 5
fi
if test -z "$curl_set"
@@ -36689,9 +26379,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -36704,14 +26394,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -36719,10 +26409,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
$as_echo "$PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -36732,9 +26422,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -36747,14 +26437,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -36762,10 +26452,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -36774,7 +26464,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -36787,13 +26477,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
@@ -36801,7 +26491,7 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for CURL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
$as_echo_n "checking for CURL... " >&6; }
if test -n "$PKG_CONFIG"; then
@@ -36809,11 +26499,11 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libdap_libcurl_module\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libdap_libcurl_module\""; } >&5
($PKG_CONFIG --exists --print-errors "$libdap_libcurl_module") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "$libdap_libcurl_module" 2>/dev/null`
else
pkg_failed=yes
@@ -36827,11 +26517,11 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_CURL_LIBS="$CURL_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libdap_libcurl_module\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libdap_libcurl_module\""; } >&5
($PKG_CONFIG --exists --print-errors "$libdap_libcurl_module") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "$libdap_libcurl_module" 2>/dev/null`
else
pkg_failed=yes
@@ -36858,7 +26548,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$CURL_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
libdap_pkgconfig_libcurl=no
elif test $pkg_failed = untried; then
@@ -36866,18 +26556,18 @@ elif test $pkg_failed = untried; then
else
CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
CURL_LIBS=$pkg_cv_CURL_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
- { $as_echo "$as_me:$LINENO: checking for libcurl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
$as_echo_n "checking for libcurl... " >&6; }
if test $libdap_pkgconfig_libcurl = 'yes'
then
curlprivatereq=$libdap_libcurl_module
CURL_STATIC_LIBS="`$PKG_CONFIG --static --libs libcurl`"
- { $as_echo "$as_me:$LINENO: result: yes; used pkg-config" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; used pkg-config" >&5
$as_echo "yes; used pkg-config" >&6; }
elif curl-config --version > /dev/null 2>&1
then
@@ -36886,24 +26576,25 @@ $as_echo "yes; used pkg-config" >&6; }
as_arg_v1="$version_libcurl"
as_arg_v2="7.19.0"
awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in
-1) { { $as_echo "$as_me:$LINENO: error: I could not find libcurl 7.19.0 or newer, found $version_libcurl" >&5
-$as_echo "$as_me: error: I could not find libcurl 7.19.0 or newer, found $version_libcurl" >&2;}
- { (exit 1); exit 1; }; };;
-0) ;;
-2) ;;
+case $? in #(
+ 1) :
+ as_fn_error $? "I could not find libcurl 7.19.0 or newer, found $version_libcurl" "$LINENO" 5 ;; #(
+ 0) :
+ ;; #(
+ 2) :
+ ;; #(
+ *) :
+ ;;
esac
CURL_LIBS="`curl-config --libs`"
CURL_STATIC_LIBS=$CURL_LIBS
curlprivatelibs="`curl-config --libs`"
CURL_CFLAGS="`curl-config --cflags`"
- { $as_echo "$as_me:$LINENO: result: yes; used curl-config and found version $version_libcurl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; used curl-config and found version $version_libcurl" >&5
$as_echo "yes; used curl-config and found version $version_libcurl" >&6; }
else
- { { $as_echo "$as_me:$LINENO: error: I could not find libcurl" >&5
-$as_echo "$as_me: error: I could not find libcurl" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "I could not find libcurl" "$LINENO" 5
fi
fi
@@ -36915,7 +26606,7 @@ fi
# Check whether --with-xml2 was given.
-if test "${with_xml2+set}" = set; then
+if test "${with_xml2+set}" = set; then :
withval=$with_xml2; with_xml2_prefix="$withval"
else
with_xml2_prefix=""
@@ -36928,7 +26619,7 @@ xml_set=
if test -n "$with_xml2_prefix" -a -x $with_xml2_prefix/bin/xml2-config
then
- { $as_echo "$as_me:$LINENO: Using $with_xml2_prefix as the libxml2 prefix directory." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using $with_xml2_prefix as the libxml2 prefix directory." >&5
$as_echo "$as_me: Using $with_xml2_prefix as the libxml2 prefix directory." >&6;}
XML2_LIBS="`$with_xml2_prefix/bin/xml2-config --libs`"
xmlprivatelibs="`$with_xml2_prefix/bin/xml2-config --libs`"
@@ -36936,9 +26627,7 @@ $as_echo "$as_me: Using $with_xml2_prefix as the libxml2 prefix directory." >&6;
xml_set="yes"
elif test -n "$with_xml2_prefix"
then
- { { $as_echo "$as_me:$LINENO: error: You set the libxml2 prefix directory to $with_xml2_prefix, but xml2-config is not there." >&5
-$as_echo "$as_me: error: You set the libxml2 prefix directory to $with_xml2_prefix, but xml2-config is not there." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "You set the libxml2 prefix directory to $with_xml2_prefix, but xml2-config is not there." "$LINENO" 5
fi
if test -z "$xml_set"
@@ -36947,7 +26636,7 @@ libdap_pkgconfig_libxml2=yes
libdap_libxml2_module='libxml-2.0 >= 2.7.0'
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XML2" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML2" >&5
$as_echo_n "checking for XML2... " >&6; }
if test -n "$PKG_CONFIG"; then
@@ -36955,11 +26644,11 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XML2_CFLAGS="$XML2_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libdap_libxml2_module\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libdap_libxml2_module\""; } >&5
($PKG_CONFIG --exists --print-errors "$libdap_libxml2_module") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_XML2_CFLAGS=`$PKG_CONFIG --cflags "$libdap_libxml2_module" 2>/dev/null`
else
pkg_failed=yes
@@ -36973,11 +26662,11 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XML2_LIBS="$XML2_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libdap_libxml2_module\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libdap_libxml2_module\""; } >&5
($PKG_CONFIG --exists --print-errors "$libdap_libxml2_module") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_XML2_LIBS=`$PKG_CONFIG --libs "$libdap_libxml2_module" 2>/dev/null`
else
pkg_failed=yes
@@ -37004,7 +26693,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$XML2_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
libdap_pkgconfig_libxml2=no
elif test $pkg_failed = untried; then
@@ -37012,17 +26701,17 @@ elif test $pkg_failed = untried; then
else
XML2_CFLAGS=$pkg_cv_XML2_CFLAGS
XML2_LIBS=$pkg_cv_XML2_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
-{ $as_echo "$as_me:$LINENO: checking for libxml2" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
$as_echo_n "checking for libxml2... " >&6; }
if test $libdap_pkgconfig_libxml2 = 'yes'
then
xmlprivatereq=$libdap_libxml2_module
XML2_LIBS="`$PKG_CONFIG --libs libxml-2.0`"
- { $as_echo "$as_me:$LINENO: result: yes; used pkg-config" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; used pkg-config" >&5
$as_echo "yes; used pkg-config" >&6; }
elif xml2-config --version > /dev/null 2>&1
then
@@ -37031,23 +26720,24 @@ then
as_arg_v1="$version_libxml2"
as_arg_v2="2.7.0"
awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in
-1) { { $as_echo "$as_me:$LINENO: error: I could not find libxml2 2.7.0 or newer" >&5
-$as_echo "$as_me: error: I could not find libxml2 2.7.0 or newer" >&2;}
- { (exit 1); exit 1; }; };;
-0) ;;
-2) ;;
+case $? in #(
+ 1) :
+ as_fn_error $? "I could not find libxml2 2.7.0 or newer" "$LINENO" 5 ;; #(
+ 0) :
+ ;; #(
+ 2) :
+ ;; #(
+ *) :
+ ;;
esac
XML2_LIBS="`xml2-config --libs`"
XML2_CFLAGS="`xml2-config --cflags`"
xmlprivatelibs="`xml2-config --libs `"
- { $as_echo "$as_me:$LINENO: result: yes; used xml2-config and found version $version_libxml2" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; used xml2-config and found version $version_libxml2" >&5
$as_echo "yes; used xml2-config and found version $version_libxml2" >&6; }
else
- { { $as_echo "$as_me:$LINENO: error: I could not find ml2-config" >&5
-$as_echo "$as_me: error: I could not find ml2-config" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "I could not find ml2-config" "$LINENO" 5
fi
fi
@@ -37056,18 +26746,14 @@ fi
-{ $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
+if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -37085,64 +26771,33 @@ return pthread_kill ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pthread_pthread_kill=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_pthread_kill=no
+ ac_cv_lib_pthread_pthread_kill=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
+if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
PTHREAD_LIBS="-lpthread"
else
- { { $as_echo "$as_me:$LINENO: error: I could not find pthreads" >&5
-$as_echo "$as_me: error: I could not find pthreads" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "I could not find pthreads" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
-if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
+if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-luuid $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -37160,43 +26815,18 @@ return uuid_generate ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_uuid_uuid_generate=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_uuid_uuid_generate=no
+ ac_cv_lib_uuid_uuid_generate=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
-if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then
+if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
UUID_LIBS="-luuid"
else
UUID_LIBS=""
@@ -37208,7 +26838,7 @@ fi
# Check whether --with-cppunit-prefix was given.
-if test "${with_cppunit_prefix+set}" = set; then
+if test "${with_cppunit_prefix+set}" = set; then :
withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
else
cppunit_config_prefix=""
@@ -37216,7 +26846,7 @@ fi
# Check whether --with-cppunit-exec-prefix was given.
-if test "${with_cppunit_exec_prefix+set}" = set; then
+if test "${with_cppunit_exec_prefix+set}" = set; then :
withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
else
cppunit_config_exec_prefix=""
@@ -37238,9 +26868,9 @@ fi
# Extract the first word of "cppunit-config", so it can be a program name with args.
set dummy cppunit-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then
+if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CPPUNIT_CONFIG in
@@ -37253,14 +26883,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
@@ -37269,21 +26899,21 @@ esac
fi
CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
if test -n "$CPPUNIT_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
$as_echo "$CPPUNIT_CONFIG" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
cppunit_version_min=1.12.0
- { $as_echo "$as_me:$LINENO: checking for Cppunit - version >= $cppunit_version_min" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5
$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; }
no_cppunit=""
if test "$CPPUNIT_CONFIG" = "no" ; then
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
no_cppunit=yes
else
@@ -37325,10 +26955,10 @@ $as_echo "no" >&6; }
$cppunit_micro_version \>= $cppunit_micro_min `
if test "$cppunit_version_proper" = "1" ; then
- { $as_echo "$as_me:$LINENO: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
no_cppunit=yes
fi
@@ -37349,7 +26979,7 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for CPPUNIT" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5
$as_echo_n "checking for CPPUNIT... " >&6; }
if test -n "$PKG_CONFIG"; then
@@ -37357,11 +26987,11 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.12.0\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.12.0\""; } >&5
($PKG_CONFIG --exists --print-errors "cppunit >= 1.12.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.0" 2>/dev/null`
else
pkg_failed=yes
@@ -37375,11 +27005,11 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.12.0\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.12.0\""; } >&5
($PKG_CONFIG --exists --print-errors "cppunit >= 1.12.0") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.0" 2>/dev/null`
else
pkg_failed=yes
@@ -37406,7 +27036,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$CPPUNIT_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if false; then
CPPUNIT_TRUE=
@@ -37430,7 +27060,7 @@ fi
else
CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS
CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
if true; then
CPPUNIT_TRUE=
@@ -37450,7 +27080,7 @@ fi
# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
+if test "${enable_debug+set}" = set; then :
enableval=$enable_debug; DEBUG=$enableval
else
DEBUG=no
@@ -37461,39 +27091,29 @@ fi
no)
;;
1)
- { $as_echo "$as_me:$LINENO: result: Setting debugging to level 1" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debugging to level 1" >&5
$as_echo "Setting debugging to level 1" >&6; }
- cat >>confdefs.h <<\_ACEOF
-#define DODS_DEBUG 1
-_ACEOF
+ $as_echo "#define DODS_DEBUG 1" >>confdefs.h
;;
2)
- { $as_echo "$as_me:$LINENO: result: Setting debugging to level 2" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debugging to level 2" >&5
$as_echo "Setting debugging to level 2" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define DODS_DEBUG /**/
-_ACEOF
+$as_echo "#define DODS_DEBUG /**/" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define DODS_DEBUG2 /**/
-_ACEOF
+$as_echo "#define DODS_DEBUG2 /**/" >>confdefs.h
;;
*)
- { { $as_echo "$as_me:$LINENO: error: Bad debug value" >&5
-$as_echo "$as_me: error: Bad debug value" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "Bad debug value" "$LINENO" 5
;;
esac
-if test "$prefix" = "NONE"; then
+if test "$prefix" = "NONE"; then :
-cat >>confdefs.h <<\_ACEOF
-#define LIBDAP_ROOT "/usr/local"
-_ACEOF
+$as_echo "#define LIBDAP_ROOT \"/usr/local\"" >>confdefs.h
else
@@ -37503,21 +27123,18 @@ _ACEOF
fi
-
# Check whether --enable-dap4 was given.
-if test "${enable_dap4+set}" = set; then
+if test "${enable_dap4+set}" = set; then :
enableval=$enable_dap4; enable_dap4=${enableval}
else
enable_dap4=yes
fi
-if test x$enable_dap4 = xyes; then
+if test x$enable_dap4 = xyes; then :
-cat >>confdefs.h <<\_ACEOF
-#define DAP4 1
-_ACEOF
+$as_echo "#define DAP4 1" >>confdefs.h
if true; then
DAP4_DEFINED_TRUE=
@@ -37539,17 +27156,16 @@ fi
fi
-
# Check whether --enable-developer was given.
-if test "${enable_developer+set}" = set; then
+if test "${enable_developer+set}" = set; then :
enableval=$enable_developer; build_developer=${enableval}
else
build_developer=no
fi
-if test x$build_developer = xyes; then
- { $as_echo "$as_me:$LINENO: Building developer version" >&5
+if test x$build_developer = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Building developer version" >&5
$as_echo "$as_me: Building developer version" >&6;}
if true; then
BUILD_DEVELOPER_TRUE=
@@ -37560,7 +27176,7 @@ else
fi
else
- { $as_echo "$as_me:$LINENO: Not building developer version" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Not building developer version" >&5
$as_echo "$as_me: Not building developer version" >&6;}
if false; then
BUILD_DEVELOPER_TRUE=
@@ -37571,56 +27187,89 @@ else
fi
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
+$as_echo "#define NDEBUG 1" >>confdefs.h
fi
-
# Check whether --enable-coverage was given.
-if test "${enable_coverage+set}" = set; then
+if test "${enable_coverage+set}" = set; then :
enableval=$enable_coverage; coverage=$enableval
else
coverage=no
fi
-if test x$coverage = xyes; then
- if test x$GCC = xyes; then
+if test x$coverage = xyes; then :
+ if test x$GCC = xyes; then :
CFLAGS="-fprofile-arcs -ftest-coverage -pg $CFLAGS"
CXXFLAGS="-fprofile-arcs -ftest-coverage -pg $CXXFLAGS"
LDFLAGS="-pg $LDFLAGS"
- { $as_echo "$as_me:$LINENO: Building coverage reporting." >&5
-$as_echo "$as_me: Building coverage reporting." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcov_open in -lgcov" >&5
+$as_echo_n "checking for gcov_open in -lgcov... " >&6; }
+if ${ac_cv_lib_gcov_gcov_open+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- { { $as_echo "$as_me:$LINENO: error: Can only enable coverage when using gcc." >&5
-$as_echo "$as_me: error: Can only enable coverage when using gcc." >&2;}
- { (exit 1); exit 1; }; }
-fi
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgcov $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gcov_open ();
+int
+main ()
+{
+return gcov_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_gcov_gcov_open=yes
+else
+ ac_cv_lib_gcov_gcov_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcov_gcov_open" >&5
+$as_echo "$ac_cv_lib_gcov_gcov_open" >&6; }
+if test "x$ac_cv_lib_gcov_gcov_open" = xyes; then :
+ LIBS="$LIBS -lgcov"
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Building coverage reporting." >&5
+$as_echo "$as_me: Building coverage reporting." >&6;}
+else
+ as_fn_error $? "Can only enable coverage when using gcc." "$LINENO" 5
+fi
+fi
# Support for running test cases using valgrind:
use_valgrind=no
# Check whether --enable-valgrind was given.
-if test "${enable_valgrind+set}" = set; then
+if test "${enable_valgrind+set}" = set; then :
enableval=$enable_valgrind; use_valgrind=$enableval
else
use_valgrind=no
fi
-if test x$use_valgrind = xyes ; then
+if test x$use_valgrind = xyes ; then :
# Extract the first word of "valgrind", so it can be a program name with args.
set dummy valgrind; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_HAVE_VALGRIND+set}" = set; then
+if ${ac_cv_prog_HAVE_VALGRIND+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$HAVE_VALGRIND"; then
@@ -37631,14 +27280,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAVE_VALGRIND="yes"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_prog_HAVE_VALGRIND" && ac_cv_prog_HAVE_VALGRIND="no"
@@ -37646,26 +27295,22 @@ fi
fi
HAVE_VALGRIND=$ac_cv_prog_HAVE_VALGRIND
if test -n "$HAVE_VALGRIND"; then
- { $as_echo "$as_me:$LINENO: result: $HAVE_VALGRIND" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_VALGRIND" >&5
$as_echo "$HAVE_VALGRIND" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test x$HAVE_VALGRIND = xyes ; then
- { $as_echo "$as_me:$LINENO: Using valgrind with unit tests." >&5
+ if test x$HAVE_VALGRIND = xyes ; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using valgrind with unit tests." >&5
$as_echo "$as_me: Using valgrind with unit tests." >&6;}
else
- { { $as_echo "$as_me:$LINENO: error: Valgrind not found in PATH." >&5
-$as_echo "$as_me: error: Valgrind not found in PATH." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "Valgrind not found in PATH." "$LINENO" 5
fi
-
fi
-
if test x$use_valgrind = xyes; then
USE_VALGRIND_TRUE=
USE_VALGRIND_FALSE='#'
@@ -37682,8 +27327,6 @@ fi
-
-
ac_config_files="$ac_config_files Makefile libdap.pc libdapclient.pc libdapserver.pc main_page.doxygen doxy.conf abi_checker.xml gl/Makefile d4_ce/Makefile d4_function/Makefile tests/Makefile tests/atlocal unit-tests/Makefile unit-tests/cache-testsuite/Makefile"
@@ -37717,13 +27360,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -37731,8 +27374,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -37754,12 +27397,23 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
@@ -37773,20 +27427,29 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -37796,103 +27459,57 @@ else
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${COMPILER_IS_GCC_TRUE}" && test -z "${COMPILER_IS_GCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"COMPILER_IS_GCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"COMPILER_IS_GCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"COMPILER_IS_GCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${COMPILER_IS_GCC_TRUE}" && test -z "${COMPILER_IS_GCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"COMPILER_IS_GCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"COMPILER_IS_GCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"COMPILER_IS_GCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_C99_TYPES_TRUE}" && test -z "${USE_C99_TYPES_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_C99_TYPES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"USE_C99_TYPES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"USE_C99_TYPES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GL_COND_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GL_COND_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GL_GENERATE_BYTESWAP_H_TRUE}" && test -z "${GL_GENERATE_BYTESWAP_H_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_BYTESWAP_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GL_GENERATE_BYTESWAP_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"GL_GENERATE_BYTESWAP_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_STDDEF_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GL_GENERATE_STDDEF_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_STDDEF_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GL_GENERATE_STDDEF_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_STDINT_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GL_GENERATE_STDINT_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
gl_libobjs=
@@ -37927,76 +27544,50 @@ fi
if test -z "${CPPUNIT_TRUE}" && test -z "${CPPUNIT_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CPPUNIT_TRUE}" && test -z "${CPPUNIT_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CPPUNIT_TRUE}" && test -z "${CPPUNIT_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CPPUNIT_TRUE}" && test -z "${CPPUNIT_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${DAP4_DEFINED_TRUE}" && test -z "${DAP4_DEFINED_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"DAP4_DEFINED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DAP4_DEFINED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"DAP4_DEFINED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${DAP4_DEFINED_TRUE}" && test -z "${DAP4_DEFINED_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"DAP4_DEFINED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"DAP4_DEFINED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"DAP4_DEFINED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_DEVELOPER_TRUE}" && test -z "${BUILD_DEVELOPER_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DEVELOPER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_DEVELOPER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"BUILD_DEVELOPER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_DEVELOPER_TRUE}" && test -z "${BUILD_DEVELOPER_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DEVELOPER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_DEVELOPER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"BUILD_DEVELOPER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_VALGRIND_TRUE}" && test -z "${USE_VALGRIND_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_VALGRIND\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"USE_VALGRIND\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "conditional \"USE_VALGRIND\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -38006,17 +27597,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -38024,23 +27616,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -38048,7 +27632,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -38059,7 +27649,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -38082,13 +27672,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -38098,15 +27681,16 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -38118,12 +27702,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -38135,7 +27723,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -38149,8 +27819,12 @@ else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
@@ -38170,133 +27844,118 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
else
- as_expr=false
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
+ fi
+else
+ as_ln_s='cp -pR'
fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -38306,13 +27965,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# 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.18.3, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+This file was extended by libdap $as_me 3.19.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -38344,13 +28009,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -38369,16 +28036,17 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <bug-autoconf at gnu.org>."
+Report bugs to <opendap-tech at opendap.org>."
_ACEOF
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.18.3
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+libdap config.status 3.19.0
+configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -38396,11 +28064,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -38414,27 +28087,29 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
+ as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -38442,11 +28117,10 @@ Try \`$0 --help' for more information." >&2
ac_cs_silent=: ;;
# This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
+ *) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
esac
@@ -38463,7 +28137,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -38487,6 +28161,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
+
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -38497,184 +28172,208 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+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"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+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_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"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $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"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+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"`'
+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"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+SED \
GREP \
EGREP \
FGREP \
@@ -38687,8 +28386,13 @@ reload_flag \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
AR \
AR_FLAGS \
+archiver_list_spec \
STRIP \
RANLIB \
CC \
@@ -38698,14 +28402,14 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
+nm_file_list_spec \
lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
lt_prog_compiler_pic \
+lt_prog_compiler_wl \
lt_prog_compiler_static \
lt_cv_prog_compiler_c_o \
need_locks \
+MANIFEST_TOOL \
DSYMUTIL \
NMEDIT \
LIPO \
@@ -38721,7 +28425,6 @@ no_undefined_flag \
hardcode_libdir_flag_spec \
hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
-fix_srcfile_path \
exclude_expsyms \
include_expsyms \
file_list_spec \
@@ -38729,6 +28432,7 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
+install_override_mode \
finish_eval \
old_striplib \
striplib \
@@ -38739,10 +28443,11 @@ predeps \
postdeps \
compiler_lib_search_path \
LD_CXX \
+reload_flag_CXX \
compiler_CXX \
lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_wl_CXX \
lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
lt_prog_compiler_static_CXX \
lt_cv_prog_compiler_c_o_CXX \
export_dynamic_flag_spec_CXX \
@@ -38754,7 +28459,6 @@ no_undefined_flag_CXX \
hardcode_libdir_flag_spec_CXX \
hardcode_libdir_flag_spec_ld_CXX \
hardcode_libdir_separator_CXX \
-fix_srcfile_path_CXX \
exclude_expsyms_CXX \
include_expsyms_CXX \
file_list_spec_CXX \
@@ -38764,9 +28468,9 @@ postdep_objects_CXX \
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -38788,11 +28492,13 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
+postlink_cmds \
postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec \
+reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
@@ -38801,10 +28507,11 @@ archive_expsym_cmds_CXX \
module_cmds_CXX \
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
-prelink_cmds_CXX; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -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\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -38812,12 +28519,6 @@ prelink_cmds_CXX; do
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
- ;;
-esac
-
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
@@ -38870,9 +28571,7 @@ do
"unit-tests/cache-testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES unit-tests/cache-testsuite/Makefile" ;;
"dap-config") CONFIG_FILES="$CONFIG_FILES dap-config" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -38895,26 +28594,24 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ trap 'as_fn_exit 1' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -38922,7 +28619,13 @@ $debug ||
if test -n "$CONFIG_FILES"; then
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
ac_cs_awk_cr='\\r'
@@ -38930,7 +28633,7 @@ else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
@@ -38939,24 +28642,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -38964,7 +28661,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -38978,7 +28675,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -38992,7 +28689,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -39012,7 +28709,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -39044,23 +28741,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (exit 1); exit 1; }; }
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -39072,7 +28775,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -39084,13 +28787,11 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -39175,9 +28876,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -39190,9 +28889,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
- { (exit 1); exit 1; }; };;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -39211,7 +28908,7 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -39220,12 +28917,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- ac_file_inputs="$ac_file_inputs '$ac_f'"
+ as_fn_append ac_file_inputs " '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -39236,7 +28931,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
@@ -39248,10 +28943,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -39279,47 +28972,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
case "$ac_dir" in
@@ -39376,7 +29029,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-
ac_sed_dataroot='
/datarootdir/ {
p
@@ -39386,12 +29038,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -39401,7 +29052,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
@@ -39429,27 +29080,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
+which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
esac \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -39458,27 +29106,21 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
- { (exit 1); exit 1; }; }
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -39516,7 +29158,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -39526,7 +29168,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
"tests/atconfig":C) cat >tests/atconfig <<ATEOF
# Configurable variable values for building test suites.
# Generated by $0.
-# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
at_testdir='tests'
@@ -39547,7 +29189,7 @@ SHELL=\${CONFIG_SHELL-'$SHELL'}
ATEOF
;;
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -39560,7 +29202,7 @@ ATEOF
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -39594,21 +29236,19 @@ $as_echo X"$mf" |
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
@@ -39634,47 +29274,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
@@ -39702,7 +29302,8 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -39750,6 +29351,12 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
# The host system.
host_alias=$host_alias
host=$host
@@ -39799,9 +29406,11 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
@@ -39809,13 +29418,30 @@ OBJDUMP=$lt_OBJDUMP
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
file_magic_cmd=$lt_file_magic_cmd
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
# The archiver.
AR=$lt_AR
+
+# Flags to create an archive.
AR_FLAGS=$lt_AR_FLAGS
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
# A symbol stripping program.
STRIP=$lt_STRIP
@@ -39824,6 +29450,9 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
# A C compiler.
LTCC=$lt_CC
@@ -39842,14 +29471,14 @@ 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 of the directory that contains temporary libtool files.
-objdir=$objdir
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
@@ -39857,6 +29486,9 @@ MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
@@ -39913,6 +29545,9 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
@@ -39952,6 +29587,10 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
@@ -39964,12 +29603,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
# Additional compiler flags for building library objects.
pic_flag=$lt_lt_prog_compiler_pic
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
@@ -40056,9 +29695,6 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
@@ -40074,6 +29710,9 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
@@ -40120,212 +29759,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# 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 ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# 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 ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# 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_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}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
-
-# 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 ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -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 file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# 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 "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1+=\$2"
-}
-_LT_EOF
- ;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1=\$$1\$2"
-}
-
-_LT_EOF
- ;;
- esac
-
-
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" ||
+ 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"
@@ -40337,6 +29933,10 @@ _LT_EOF
# The linker used to build libraries.
LD=$lt_LD_CXX
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
@@ -40349,12 +29949,12 @@ with_gcc=$GCC_CXX
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
# Additional compiler flags for building library objects.
pic_flag=$lt_lt_prog_compiler_pic_CXX
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static_CXX
@@ -40441,9 +30041,6 @@ inherit_rpath=$inherit_rpath_CXX
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs_CXX
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path_CXX
-
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
@@ -40459,6 +30056,9 @@ include_expsyms=$lt_include_expsyms_CXX
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds_CXX
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec_CXX
@@ -40489,15 +30089,12 @@ _LT_EOF
done # for ac_tag
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -40518,10 +30115,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
diff --git a/configure.ac b/configure.ac
index 5ca349c..96be276 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.63)
dnl Update version here and below at LIB_CURRENT, ..., if needed.
-AC_INIT(libdap, 3.18.3, opendap-tech at opendap.org)
+AC_INIT(libdap, 3.19.0, opendap-tech at opendap.org)
AC_DEFINE(DAP_PROTOCOL_VERSION, ["4.0"], [Highest DAP version implemented?])
AC_SUBST(DAP_PROTOCOL_VERSION)
@@ -45,9 +45,9 @@ dnl increment AGE, set REVISION to 0.
dnl Interfaces removed or changed (BAD, breaks upward compatibility):
dnl ==> Increment CURRENT, set AGE and REVISION to 0.
-DAPLIB_CURRENT=24
-DAPLIB_AGE=1
-DAPLIB_REVISION=1
+DAPLIB_CURRENT=25
+DAPLIB_AGE=0
+DAPLIB_REVISION=0
AC_SUBST(DAPLIB_CURRENT)
AC_SUBST(DAPLIB_AGE)
AC_SUBST(DAPLIB_REVISION)
diff --git a/d4_ce/D4ConstraintEvaluator.cc b/d4_ce/D4ConstraintEvaluator.cc
index 2401bb5..ba1c79a 100644
--- a/d4_ce/D4ConstraintEvaluator.cc
+++ b/d4_ce/D4ConstraintEvaluator.cc
@@ -237,7 +237,9 @@ D4ConstraintEvaluator::mark_array_variable(BaseType *btp)
throw Error(malformed_expr, "An array with Maps was found, but one of the Maps was not defined correctly.");
Array *map = const_cast<Array*>((*m)->array()); // Array lacks const iterator support
- if (array_uses_shared_dimension(map, dim)) {
+ // Added a test to ensure 'dim' is not null. This could be the case if
+ // execution gets here and the index *i was not empty. jhrg 4/18/17
+ if (dim && array_uses_shared_dimension(map, dim)) {
D4Map *map_to_be_removed = *m;
a->maps()->remove_map(map_to_be_removed); // Invalidates the iterator
delete map_to_be_removed; // removed from container; delete
diff --git a/d4_ce/Makefile.in b/d4_ce/Makefile.in
index 5c50ef4..eac6798 100644
--- a/d4_ce/Makefile.in
+++ b/d4_ce/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in 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.
@@ -17,6 +16,51 @@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -37,8 +81,8 @@ host_triplet = @host@
@COMPILER_IS_GCC_TRUE at am__append_1 = -Wall -W -Wcast-align
@BUILD_DEVELOPER_TRUE at am__append_2 = $(CXXFLAGS_DEBUG)
subdir = d4_ce
-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/conf/depcomp $(pkginclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
$(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -98,34 +142,73 @@ am_libd4_ce_parser_la_OBJECTS = libd4_ce_parser_la-lex.d4_ce.lo \
libd4_ce_parser_la-d4_ce_parser.tab.lo \
libd4_ce_parser_la-D4ConstraintEvaluator.lo
libd4_ce_parser_la_OBJECTS = $(am_libd4_ce_parser_la_OBJECTS)
-libd4_ce_parser_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libd4_ce_parser_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libd4_ce_parser_la_SOURCES)
DIST_SOURCES = $(libd4_ce_parser_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -147,8 +230,31 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludedir)"
HEADERS = $(pkginclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -157,6 +263,7 @@ ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
@@ -196,6 +303,7 @@ DAPLIB_REVISION = @DAPLIB_REVISION@
DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DVR = @DVR@
@@ -511,6 +619,7 @@ LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
@@ -544,6 +653,7 @@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
@@ -648,6 +758,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -690,7 +801,6 @@ libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -780,14 +890,17 @@ $(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libd4_ce_parser.la: $(libd4_ce_parser_la_OBJECTS) $(libd4_ce_parser_la_DEPENDENCIES)
- $(libd4_ce_parser_la_LINK) $(libd4_ce_parser_la_OBJECTS) $(libd4_ce_parser_la_LIBADD) $(LIBS)
+ @list='$(noinst_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
+libd4_ce_parser.la: $(libd4_ce_parser_la_OBJECTS) $(libd4_ce_parser_la_DEPENDENCIES) $(EXTRA_libd4_ce_parser_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(libd4_ce_parser_la_LINK) $(libd4_ce_parser_la_OBJECTS) $(libd4_ce_parser_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -800,46 +913,46 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Plo at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.lo:
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
libd4_ce_parser_la-lex.d4_ce.lo: lex.d4_ce.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-lex.d4_ce.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Tpo -c -o libd4_ce_parser_la-lex.d4_ce.lo `test -f 'lex.d4_ce.cc' || echo '$(srcdir)/'`lex.d4_ce.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Tpo $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lex.d4_ce.cc' object='libd4_ce_parser_la-lex.d4_ce.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-lex.d4_ce.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Tpo -c -o libd4_ce_parser_la-lex.d4_ce.lo `test -f 'lex.d4_ce.cc' || echo '$(srcdir)/'`lex.d4_ce.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Tpo $(DEPDIR)/libd4_ce_parser_la-lex.d4_ce.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='lex.d4_ce.cc' object='libd4_ce_parser_la-lex.d4_ce.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-lex.d4_ce.lo `test -f 'lex.d4_ce.cc' || echo '$(srcdir)/'`lex.d4_ce.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-lex.d4_ce.lo `test -f 'lex.d4_ce.cc' || echo '$(srcdir)/'`lex.d4_ce.cc
libd4_ce_parser_la-d4_ce_parser.tab.lo: d4_ce_parser.tab.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-d4_ce_parser.tab.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Tpo -c -o libd4_ce_parser_la-d4_ce_parser.tab.lo `test -f 'd4_ce_parser.tab.cc' || echo '$(srcdir)/'`d4_ce_parser.tab.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Tpo $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='d4_ce_parser.tab.cc' object='libd4_ce_parser_la-d4_ce_parser.tab.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-d4_ce_parser.tab.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Tpo -c -o libd4_ce_parser_la-d4_ce_parser.tab.lo `test -f 'd4_ce_parser.tab.cc' || echo '$(srcdir)/'`d4_ce_parser.tab.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Tpo $(DEPDIR)/libd4_ce_parser_la-d4_ce_parser.tab.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='d4_ce_parser.tab.cc' object='libd4_ce_parser_la-d4_ce_parser.tab.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-d4_ce_parser.tab.lo `test -f 'd4_ce_parser.tab.cc' || echo '$(srcdir)/'`d4_ce_parser.tab.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-d4_ce_parser.tab.lo `test -f 'd4_ce_parser.tab.cc' || echo '$(srcdir)/'`d4_ce_parser.tab.cc
libd4_ce_parser_la-D4ConstraintEvaluator.lo: D4ConstraintEvaluator.cc
- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-D4ConstraintEvaluator.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Tpo -c -o libd4_ce_parser_la-D4ConstraintEvaluator.lo `test -f 'D4ConstraintEvaluator.cc' || echo '$(srcdir)/'`D4ConstraintEvaluator.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Tpo $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4ConstraintEvaluator.cc' object='libd4_ce_parser_la-D4ConstraintEvaluator.lo' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -MT libd4_ce_parser_la-D4ConstraintEvaluator.lo -MD -MP -MF $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Tpo -c -o libd4_ce_parser_la-D4ConstraintEvaluator.lo `test -f 'D4ConstraintEvaluator.cc' || echo '$(srcdir)/'`D4ConstraintEvaluator.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Tpo $(DEPDIR)/libd4_ce_parser_la-D4ConstraintEvaluator.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4ConstraintEvaluator.cc' object='libd4_ce_parser_la-D4ConstraintEvaluator.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-D4ConstraintEvaluator.lo `test -f 'D4ConstraintEvaluator.cc' || echo '$(srcdir)/'`D4ConstraintEvaluator.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libd4_ce_parser_la_CXXFLAGS) $(CXXFLAGS) -c -o libd4_ce_parser_la-D4ConstraintEvaluator.lo `test -f 'D4ConstraintEvaluator.cc' || echo '$(srcdir)/'`D4ConstraintEvaluator.cc
mostlyclean-libtool:
-rm -f *.lo
@@ -848,8 +961,11 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -863,30 +979,17 @@ uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -898,15 +1001,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -915,6 +1014,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -971,10 +1085,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -1061,19 +1180,20 @@ uninstall-am: uninstall-pkgincludeHEADERS
.MAKE: all check install install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-local clean-noinstLTLIBRARIES ctags \
- dist-hook distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pkgincludeHEADERS install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-local clean-noinstLTLIBRARIES \
+ cscopelist-am ctags ctags-am dist-hook distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgincludeHEADERS \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am \
uninstall-pkgincludeHEADERS
diff --git a/d4_ce/d4_ce_parser.tab.cc b/d4_ce/d4_ce_parser.tab.cc
index f12bb32..f5c2120 100644
--- a/d4_ce/d4_ce_parser.tab.cc
+++ b/d4_ce/d4_ce_parser.tab.cc
@@ -899,7 +899,7 @@ namespace libdap {
// User initialization code.
- #line 68 "d4_ce_parser.yy" // lalr1.cc:741
+ #line 68 "d4_ce_parser.yy" // lalr1.cc:745
{
// Initialize the initial location. This is printed when the parser builds
// its own error messages - when the parse fails as opposed to when the
@@ -908,7 +908,7 @@ namespace libdap {
yyla.location.initialize (driver.expression());
}
-#line 912 "d4_ce_parser.tab.cc" // lalr1.cc:741
+#line 912 "d4_ce_parser.tab.cc" // lalr1.cc:745
/* Initialize the stack. The initial state will be set in
yynewstate, since the latter expects the semantical and the
diff --git a/d4_ce/d4_ce_parser.tab.hh b/d4_ce/d4_ce_parser.tab.hh
index 8ba00b3..0a32aa0 100644
--- a/d4_ce/d4_ce_parser.tab.hh
+++ b/d4_ce/d4_ce_parser.tab.hh
@@ -40,7 +40,7 @@
#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:377
+#line 48 "d4_ce_parser.yy" // lalr1.cc:392
#include "D4ConstraintEvaluator.h"
#include "escaping.h" // for www2id() used with WORD and STRING
@@ -49,7 +49,7 @@ namespace libdap {
}
-#line 53 "d4_ce_parser.tab.hh" // lalr1.cc:377
+#line 53 "d4_ce_parser.tab.hh" // lalr1.cc:392
# include <cassert>
# include <cstdlib> // std::abort
@@ -124,9 +124,9 @@ namespace libdap {
# define YYDEBUG 1
#endif
-#line 35 "d4_ce_parser.yy" // lalr1.cc:377
+#line 35 "d4_ce_parser.yy" // lalr1.cc:392
namespace libdap {
-#line 130 "d4_ce_parser.tab.hh" // lalr1.cc:377
+#line 130 "d4_ce_parser.tab.hh" // lalr1.cc:392
@@ -792,9 +792,9 @@ namespace libdap {
};
-#line 35 "d4_ce_parser.yy" // lalr1.cc:377
+#line 35 "d4_ce_parser.yy" // lalr1.cc:392
} // libdap
-#line 798 "d4_ce_parser.tab.hh" // lalr1.cc:377
+#line 798 "d4_ce_parser.tab.hh" // lalr1.cc:392
diff --git a/d4_ce/location.hh b/d4_ce/location.hh
index 24a313c..052f4a1 100644
--- a/d4_ce/location.hh
+++ b/d4_ce/location.hh
@@ -40,9 +40,9 @@
# include "position.hh"
-#line 35 "d4_ce_parser.yy" // location.cc:296
+#line 35 "d4_ce_parser.yy" // location.cc:337
namespace libdap {
-#line 46 "location.hh" // location.cc:296
+#line 46 "location.hh" // location.cc:337
/// Abstract a location.
class location
{
@@ -186,7 +186,7 @@ namespace libdap {
return ostr;
}
-#line 35 "d4_ce_parser.yy" // location.cc:296
+#line 35 "d4_ce_parser.yy" // location.cc:337
} // libdap
-#line 192 "location.hh" // location.cc:296
+#line 192 "location.hh" // location.cc:337
#endif // !YY_YY_LOCATION_HH_INCLUDED
diff --git a/d4_ce/position.hh b/d4_ce/position.hh
index 853ddb2..3f982db 100644
--- a/d4_ce/position.hh
+++ b/d4_ce/position.hh
@@ -50,9 +50,9 @@
# endif
# endif
-#line 35 "d4_ce_parser.yy" // location.cc:296
+#line 35 "d4_ce_parser.yy" // location.cc:337
namespace libdap {
-#line 56 "position.hh" // location.cc:296
+#line 56 "position.hh" // location.cc:337
/// Abstract a position.
class position
{
@@ -174,7 +174,7 @@ namespace libdap {
return ostr << pos.line << '.' << pos.column;
}
-#line 35 "d4_ce_parser.yy" // location.cc:296
+#line 35 "d4_ce_parser.yy" // location.cc:337
} // libdap
-#line 180 "position.hh" // location.cc:296
+#line 180 "position.hh" // location.cc:337
#endif // !YY_YY_POSITION_HH_INCLUDED
diff --git a/d4_ce/stack.hh b/d4_ce/stack.hh
index cb0d137..d46725b 100644
--- a/d4_ce/stack.hh
+++ b/d4_ce/stack.hh
@@ -40,9 +40,9 @@
# include <vector>
-#line 35 "d4_ce_parser.yy" // stack.hh:132
+#line 35 "d4_ce_parser.yy" // stack.hh:151
namespace libdap {
-#line 46 "stack.hh" // stack.hh:132
+#line 46 "stack.hh" // stack.hh:151
template <class T, class S = std::vector<T> >
class stack
{
@@ -150,8 +150,8 @@ namespace libdap {
unsigned int range_;
};
-#line 35 "d4_ce_parser.yy" // stack.hh:132
+#line 35 "d4_ce_parser.yy" // stack.hh:151
} // libdap
-#line 156 "stack.hh" // stack.hh:132
+#line 156 "stack.hh" // stack.hh:151
#endif // !YY_YY_STACK_HH_INCLUDED
diff --git a/d4_function/Makefile.in b/d4_function/Makefile.in
index 691a836..1bf90b9 100644
--- a/d4_function/Makefile.in
+++ b/d4_function/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in 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.
@@ -17,6 +16,51 @@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -37,8 +81,8 @@ host_triplet = @host@
@COMPILER_IS_GCC_TRUE at am__append_1 = -Wall -W -Wcast-align
@BUILD_DEVELOPER_TRUE at am__append_2 = $(CXXFLAGS_DEBUG)
subdir = d4_function
-DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/conf/depcomp $(pkginclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
$(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -98,30 +142,69 @@ am_libd4_function_parser_la_OBJECTS = D4FunctionEvaluator.lo \
d4_function_parser.tab.lo lex.d4_function.lo
libd4_function_parser_la_OBJECTS = \
$(am_libd4_function_parser_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libd4_function_parser_la_SOURCES)
DIST_SOURCES = $(libd4_function_parser_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -143,8 +226,31 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludedir)"
HEADERS = $(pkginclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -153,6 +259,7 @@ ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
@@ -192,6 +299,7 @@ DAPLIB_REVISION = @DAPLIB_REVISION@
DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DVR = @DVR@
@@ -507,6 +615,7 @@ LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
@@ -540,6 +649,7 @@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
@@ -644,6 +754,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -686,7 +797,6 @@ libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -777,14 +887,17 @@ $(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libd4_function_parser.la: $(libd4_function_parser_la_OBJECTS) $(libd4_function_parser_la_DEPENDENCIES)
- $(CXXLINK) $(libd4_function_parser_la_OBJECTS) $(libd4_function_parser_la_LIBADD) $(LIBS)
+ @list='$(noinst_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
+libd4_function_parser.la: $(libd4_function_parser_la_OBJECTS) $(libd4_function_parser_la_DEPENDENCIES) $(EXTRA_libd4_function_parser_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(libd4_function_parser_la_OBJECTS) $(libd4_function_parser_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -797,25 +910,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lex.d4_function.Plo at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.lo:
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -824,8 +937,11 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -839,30 +955,17 @@ uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -874,15 +977,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -891,6 +990,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -947,10 +1061,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -1037,19 +1156,20 @@ uninstall-am: uninstall-pkgincludeHEADERS
.MAKE: all check install install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-local clean-noinstLTLIBRARIES ctags \
- dist-hook distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pkgincludeHEADERS install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-local clean-noinstLTLIBRARIES \
+ cscopelist-am ctags ctags-am dist-hook distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgincludeHEADERS \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am \
uninstall-pkgincludeHEADERS
diff --git a/d4_function/d4_function_parser.tab.cc b/d4_function/d4_function_parser.tab.cc
index 82bad91..a3ed27a 100644
--- a/d4_function/d4_function_parser.tab.cc
+++ b/d4_function/d4_function_parser.tab.cc
@@ -1288,7 +1288,7 @@ namespace libdap {
// User initialization code.
- #line 69 "d4_function_parser.yy" // lalr1.cc:741
+ #line 69 "d4_function_parser.yy" // lalr1.cc:745
{
// Initialize the initial location. This is printed when the parser builds
// its own error messages - when the parse fails as opposed to when the
@@ -1297,7 +1297,7 @@ namespace libdap {
yyla.location.initialize (evaluator.expression());
}
-#line 1301 "d4_function_parser.tab.cc" // lalr1.cc:741
+#line 1301 "d4_function_parser.tab.cc" // lalr1.cc:745
/* Initialize the stack. The initial state will be set in
yynewstate, since the latter expects the semantical and the
diff --git a/d4_function/d4_function_parser.tab.hh b/d4_function/d4_function_parser.tab.hh
index 6897859..c099ee5 100644
--- a/d4_function/d4_function_parser.tab.hh
+++ b/d4_function/d4_function_parser.tab.hh
@@ -40,7 +40,7 @@
#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:377
+#line 47 "d4_function_parser.yy" // lalr1.cc:392
#include "D4FunctionEvaluator.h"
@@ -52,7 +52,7 @@ namespace libdap {
}
-#line 56 "d4_function_parser.tab.hh" // lalr1.cc:377
+#line 56 "d4_function_parser.tab.hh" // lalr1.cc:392
# include <cassert>
# include <cstdlib> // std::abort
@@ -127,9 +127,9 @@ namespace libdap {
# define YYDEBUG 1
#endif
-#line 34 "d4_function_parser.yy" // lalr1.cc:377
+#line 34 "d4_function_parser.yy" // lalr1.cc:392
namespace libdap {
-#line 133 "d4_function_parser.tab.hh" // lalr1.cc:377
+#line 133 "d4_function_parser.tab.hh" // lalr1.cc:392
@@ -842,9 +842,9 @@ namespace libdap {
};
-#line 34 "d4_function_parser.yy" // lalr1.cc:377
+#line 34 "d4_function_parser.yy" // lalr1.cc:392
} // libdap
-#line 848 "d4_function_parser.tab.hh" // lalr1.cc:377
+#line 848 "d4_function_parser.tab.hh" // lalr1.cc:392
diff --git a/d4_function/location.hh b/d4_function/location.hh
index 84a6cbe..ca6215a 100644
--- a/d4_function/location.hh
+++ b/d4_function/location.hh
@@ -40,9 +40,9 @@
# include "position.hh"
-#line 34 "d4_function_parser.yy" // location.cc:296
+#line 34 "d4_function_parser.yy" // location.cc:337
namespace libdap {
-#line 46 "location.hh" // location.cc:296
+#line 46 "location.hh" // location.cc:337
/// Abstract a location.
class location
{
@@ -186,7 +186,7 @@ namespace libdap {
return ostr;
}
-#line 34 "d4_function_parser.yy" // location.cc:296
+#line 34 "d4_function_parser.yy" // location.cc:337
} // libdap
-#line 192 "location.hh" // location.cc:296
+#line 192 "location.hh" // location.cc:337
#endif // !YY_YY_LOCATION_HH_INCLUDED
diff --git a/d4_function/position.hh b/d4_function/position.hh
index bc9d282..123a22b 100644
--- a/d4_function/position.hh
+++ b/d4_function/position.hh
@@ -50,9 +50,9 @@
# endif
# endif
-#line 34 "d4_function_parser.yy" // location.cc:296
+#line 34 "d4_function_parser.yy" // location.cc:337
namespace libdap {
-#line 56 "position.hh" // location.cc:296
+#line 56 "position.hh" // location.cc:337
/// Abstract a position.
class position
{
@@ -174,7 +174,7 @@ namespace libdap {
return ostr << pos.line << '.' << pos.column;
}
-#line 34 "d4_function_parser.yy" // location.cc:296
+#line 34 "d4_function_parser.yy" // location.cc:337
} // libdap
-#line 180 "position.hh" // location.cc:296
+#line 180 "position.hh" // location.cc:337
#endif // !YY_YY_POSITION_HH_INCLUDED
diff --git a/d4_function/stack.hh b/d4_function/stack.hh
index c5c5878..1fb476f 100644
--- a/d4_function/stack.hh
+++ b/d4_function/stack.hh
@@ -40,9 +40,9 @@
# include <vector>
-#line 34 "d4_function_parser.yy" // stack.hh:132
+#line 34 "d4_function_parser.yy" // stack.hh:151
namespace libdap {
-#line 46 "stack.hh" // stack.hh:132
+#line 46 "stack.hh" // stack.hh:151
template <class T, class S = std::vector<T> >
class stack
{
@@ -150,8 +150,8 @@ namespace libdap {
unsigned int range_;
};
-#line 34 "d4_function_parser.yy" // stack.hh:132
+#line 34 "d4_function_parser.yy" // stack.hh:151
} // libdap
-#line 156 "stack.hh" // stack.hh:132
+#line 156 "stack.hh" // stack.hh:151
#endif // !YY_YY_STACK_HH_INCLUDED
diff --git a/das.tab.cc b/das.tab.cc
index 19a6ab6..949641d 100644
--- a/das.tab.cc
+++ b/das.tab.cc
@@ -1396,7 +1396,7 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 194 "das.yy" /* yacc.c:1646 */
+#line 194 "das.yy" /* yacc.c:1661 */
{
if (!name) name = new string();
if (!type) type = new string();
@@ -1405,150 +1405,150 @@ yyreduce:
// push outermost AttrTable
PUSH(DAS_OBJ(arg)->get_top_level_attributes());
}
-#line 1409 "das.tab.cc" /* yacc.c:1646 */
+#line 1409 "das.tab.cc" /* yacc.c:1661 */
break;
case 3:
-#line 203 "das.yy" /* yacc.c:1646 */
+#line 203 "das.yy" /* yacc.c:1661 */
{
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 1420 "das.tab.cc" /* yacc.c:1646 */
+#line 1420 "das.tab.cc" /* yacc.c:1661 */
break;
case 7:
-#line 218 "das.yy" /* yacc.c:1646 */
+#line 218 "das.yy" /* yacc.c:1661 */
{
parse_error((parser_arg *)arg, NO_DAS_MSG, das_line_num);
}
-#line 1428 "das.tab.cc" /* yacc.c:1646 */
+#line 1428 "das.tab.cc" /* yacc.c:1661 */
break;
case 12:
-#line 230 "das.yy" /* yacc.c:1646 */
+#line 230 "das.yy" /* yacc.c:1661 */
{ save_str(*type, "Byte", das_line_num); }
-#line 1434 "das.tab.cc" /* yacc.c:1646 */
+#line 1434 "das.tab.cc" /* yacc.c:1661 */
break;
case 13:
-#line 231 "das.yy" /* yacc.c:1646 */
+#line 231 "das.yy" /* yacc.c:1661 */
{ save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1440 "das.tab.cc" /* yacc.c:1646 */
+#line 1440 "das.tab.cc" /* yacc.c:1661 */
break;
case 15:
-#line 234 "das.yy" /* yacc.c:1646 */
+#line 234 "das.yy" /* yacc.c:1661 */
{ save_str(*type, "Int16", das_line_num); }
-#line 1446 "das.tab.cc" /* yacc.c:1646 */
+#line 1446 "das.tab.cc" /* yacc.c:1661 */
break;
case 16:
-#line 235 "das.yy" /* yacc.c:1646 */
+#line 235 "das.yy" /* yacc.c:1661 */
{ save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1452 "das.tab.cc" /* yacc.c:1646 */
+#line 1452 "das.tab.cc" /* yacc.c:1661 */
break;
case 18:
-#line 238 "das.yy" /* yacc.c:1646 */
+#line 238 "das.yy" /* yacc.c:1661 */
{ save_str(*type, "UInt16", das_line_num); }
-#line 1458 "das.tab.cc" /* yacc.c:1646 */
+#line 1458 "das.tab.cc" /* yacc.c:1661 */
break;
case 19:
-#line 239 "das.yy" /* yacc.c:1646 */
+#line 239 "das.yy" /* yacc.c:1661 */
{ save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1464 "das.tab.cc" /* yacc.c:1646 */
+#line 1464 "das.tab.cc" /* yacc.c:1661 */
break;
case 21:
-#line 242 "das.yy" /* yacc.c:1646 */
+#line 242 "das.yy" /* yacc.c:1661 */
{ save_str(*type, "Int32", das_line_num); }
-#line 1470 "das.tab.cc" /* yacc.c:1646 */
+#line 1470 "das.tab.cc" /* yacc.c:1661 */
break;
case 22:
-#line 243 "das.yy" /* yacc.c:1646 */
+#line 243 "das.yy" /* yacc.c:1661 */
{ save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1476 "das.tab.cc" /* yacc.c:1646 */
+#line 1476 "das.tab.cc" /* yacc.c:1661 */
break;
case 24:
-#line 246 "das.yy" /* yacc.c:1646 */
+#line 246 "das.yy" /* yacc.c:1661 */
{ save_str(*type, "UInt32", das_line_num); }
-#line 1482 "das.tab.cc" /* yacc.c:1646 */
+#line 1482 "das.tab.cc" /* yacc.c:1661 */
break;
case 25:
-#line 247 "das.yy" /* yacc.c:1646 */
+#line 247 "das.yy" /* yacc.c:1661 */
{ save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1488 "das.tab.cc" /* yacc.c:1646 */
+#line 1488 "das.tab.cc" /* yacc.c:1661 */
break;
case 27:
-#line 250 "das.yy" /* yacc.c:1646 */
+#line 250 "das.yy" /* yacc.c:1661 */
{ save_str(*type, "Float32", das_line_num); }
-#line 1494 "das.tab.cc" /* yacc.c:1646 */
+#line 1494 "das.tab.cc" /* yacc.c:1661 */
break;
case 28:
-#line 251 "das.yy" /* yacc.c:1646 */
+#line 251 "das.yy" /* yacc.c:1661 */
{ save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1500 "das.tab.cc" /* yacc.c:1646 */
+#line 1500 "das.tab.cc" /* yacc.c:1661 */
break;
case 30:
-#line 254 "das.yy" /* yacc.c:1646 */
+#line 254 "das.yy" /* yacc.c:1661 */
{ save_str(*type, "Float64", das_line_num); }
-#line 1506 "das.tab.cc" /* yacc.c:1646 */
+#line 1506 "das.tab.cc" /* yacc.c:1661 */
break;
case 31:
-#line 255 "das.yy" /* yacc.c:1646 */
+#line 255 "das.yy" /* yacc.c:1661 */
{ save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1512 "das.tab.cc" /* yacc.c:1646 */
+#line 1512 "das.tab.cc" /* yacc.c:1661 */
break;
case 33:
-#line 258 "das.yy" /* yacc.c:1646 */
+#line 258 "das.yy" /* yacc.c:1661 */
{ *type = "String"; }
-#line 1518 "das.tab.cc" /* yacc.c:1646 */
+#line 1518 "das.tab.cc" /* yacc.c:1661 */
break;
case 34:
-#line 259 "das.yy" /* yacc.c:1646 */
+#line 259 "das.yy" /* yacc.c:1661 */
{ *name = (yyvsp[0]); }
-#line 1524 "das.tab.cc" /* yacc.c:1646 */
+#line 1524 "das.tab.cc" /* yacc.c:1661 */
break;
case 36:
-#line 262 "das.yy" /* yacc.c:1646 */
+#line 262 "das.yy" /* yacc.c:1661 */
{ *type = "Url"; }
-#line 1530 "das.tab.cc" /* yacc.c:1646 */
+#line 1530 "das.tab.cc" /* yacc.c:1661 */
break;
case 37:
-#line 263 "das.yy" /* yacc.c:1646 */
+#line 263 "das.yy" /* yacc.c:1661 */
{ *name = (yyvsp[0]); }
-#line 1536 "das.tab.cc" /* yacc.c:1646 */
+#line 1536 "das.tab.cc" /* yacc.c:1661 */
break;
case 39:
-#line 266 "das.yy" /* yacc.c:1646 */
+#line 266 "das.yy" /* yacc.c:1661 */
{ *type = "OtherXML"; }
-#line 1542 "das.tab.cc" /* yacc.c:1646 */
+#line 1542 "das.tab.cc" /* yacc.c:1661 */
break;
case 40:
-#line 267 "das.yy" /* yacc.c:1646 */
+#line 267 "das.yy" /* yacc.c:1661 */
{ *name = (yyvsp[0]); }
-#line 1548 "das.tab.cc" /* yacc.c:1646 */
+#line 1548 "das.tab.cc" /* yacc.c:1661 */
break;
case 42:
-#line 271 "das.yy" /* yacc.c:1646 */
+#line 271 "das.yy" /* yacc.c:1661 */
{
DBG(cerr << "Processing ID: " << (yyvsp[0]) << endl);
@@ -1568,175 +1568,175 @@ yyreduce:
DBG(cerr << " Pushed attr_tab: " << at << endl);
}
-#line 1572 "das.tab.cc" /* yacc.c:1646 */
+#line 1572 "das.tab.cc" /* yacc.c:1661 */
break;
case 43:
-#line 291 "das.yy" /* yacc.c:1646 */
+#line 291 "das.yy" /* yacc.c:1661 */
{
/* pop top of stack; store in attr_tab */
DBG(cerr << " Popped attr_tab: " << TOP_OF_STACK << endl);
POP;
}
-#line 1582 "das.tab.cc" /* yacc.c:1646 */
+#line 1582 "das.tab.cc" /* yacc.c:1661 */
break;
case 45:
-#line 299 "das.yy" /* yacc.c:1646 */
+#line 299 "das.yy" /* yacc.c:1661 */
{
parse_error(ATTR_TUPLE_MSG, das_line_num, (yyvsp[0]));
}
-#line 1590 "das.tab.cc" /* yacc.c:1646 */
+#line 1590 "das.tab.cc" /* yacc.c:1661 */
break;
case 47:
-#line 305 "das.yy" /* yacc.c:1646 */
+#line 305 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_byte);
}
-#line 1598 "das.tab.cc" /* yacc.c:1646 */
+#line 1598 "das.tab.cc" /* yacc.c:1661 */
break;
case 48:
-#line 309 "das.yy" /* yacc.c:1646 */
+#line 309 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_byte);
}
-#line 1606 "das.tab.cc" /* yacc.c:1646 */
+#line 1606 "das.tab.cc" /* yacc.c:1661 */
break;
case 49:
-#line 315 "das.yy" /* yacc.c:1646 */
+#line 315 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_int16);
}
-#line 1614 "das.tab.cc" /* yacc.c:1646 */
+#line 1614 "das.tab.cc" /* yacc.c:1661 */
break;
case 50:
-#line 319 "das.yy" /* yacc.c:1646 */
+#line 319 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_int16);
}
-#line 1622 "das.tab.cc" /* yacc.c:1646 */
+#line 1622 "das.tab.cc" /* yacc.c:1661 */
break;
case 51:
-#line 325 "das.yy" /* yacc.c:1646 */
+#line 325 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_uint16);
}
-#line 1630 "das.tab.cc" /* yacc.c:1646 */
+#line 1630 "das.tab.cc" /* yacc.c:1661 */
break;
case 52:
-#line 329 "das.yy" /* yacc.c:1646 */
+#line 329 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_uint16);
}
-#line 1638 "das.tab.cc" /* yacc.c:1646 */
+#line 1638 "das.tab.cc" /* yacc.c:1661 */
break;
case 53:
-#line 335 "das.yy" /* yacc.c:1646 */
+#line 335 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_int32);
}
-#line 1646 "das.tab.cc" /* yacc.c:1646 */
+#line 1646 "das.tab.cc" /* yacc.c:1661 */
break;
case 54:
-#line 339 "das.yy" /* yacc.c:1646 */
+#line 339 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_int32);
}
-#line 1654 "das.tab.cc" /* yacc.c:1646 */
+#line 1654 "das.tab.cc" /* yacc.c:1661 */
break;
case 55:
-#line 345 "das.yy" /* yacc.c:1646 */
+#line 345 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_uint32);
}
-#line 1662 "das.tab.cc" /* yacc.c:1646 */
+#line 1662 "das.tab.cc" /* yacc.c:1661 */
break;
case 56:
-#line 349 "das.yy" /* yacc.c:1646 */
+#line 349 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_uint32);
}
-#line 1670 "das.tab.cc" /* yacc.c:1646 */
+#line 1670 "das.tab.cc" /* yacc.c:1661 */
break;
case 57:
-#line 355 "das.yy" /* yacc.c:1646 */
+#line 355 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_float32);
}
-#line 1678 "das.tab.cc" /* yacc.c:1646 */
+#line 1678 "das.tab.cc" /* yacc.c:1661 */
break;
case 58:
-#line 359 "das.yy" /* yacc.c:1646 */
+#line 359 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_float32);
}
-#line 1686 "das.tab.cc" /* yacc.c:1646 */
+#line 1686 "das.tab.cc" /* yacc.c:1661 */
break;
case 59:
-#line 365 "das.yy" /* yacc.c:1646 */
+#line 365 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_float64);
}
-#line 1694 "das.tab.cc" /* yacc.c:1646 */
+#line 1694 "das.tab.cc" /* yacc.c:1661 */
break;
case 60:
-#line 369 "das.yy" /* yacc.c:1646 */
+#line 369 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_float64);
}
-#line 1702 "das.tab.cc" /* yacc.c:1646 */
+#line 1702 "das.tab.cc" /* yacc.c:1661 */
break;
case 61:
-#line 375 "das.yy" /* yacc.c:1646 */
+#line 375 "das.yy" /* yacc.c:1661 */
{
string attr = remove_quotes((yyvsp[0]));
add_attribute(*type, *name, attr, 0);
}
-#line 1711 "das.tab.cc" /* yacc.c:1646 */
+#line 1711 "das.tab.cc" /* yacc.c:1661 */
break;
case 62:
-#line 380 "das.yy" /* yacc.c:1646 */
+#line 380 "das.yy" /* yacc.c:1661 */
{
string attr = remove_quotes((yyvsp[0]));
add_attribute(*type, *name, attr, 0);
}
-#line 1720 "das.tab.cc" /* yacc.c:1646 */
+#line 1720 "das.tab.cc" /* yacc.c:1661 */
break;
case 63:
-#line 387 "das.yy" /* yacc.c:1646 */
+#line 387 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_url);
}
-#line 1728 "das.tab.cc" /* yacc.c:1646 */
+#line 1728 "das.tab.cc" /* yacc.c:1661 */
break;
case 64:
-#line 391 "das.yy" /* yacc.c:1646 */
+#line 391 "das.yy" /* yacc.c:1661 */
{
add_attribute(*type, *name, (yyvsp[0]), &check_url);
}
-#line 1736 "das.tab.cc" /* yacc.c:1646 */
+#line 1736 "das.tab.cc" /* yacc.c:1661 */
break;
case 65:
-#line 397 "das.yy" /* yacc.c:1646 */
+#line 397 "das.yy" /* yacc.c:1661 */
{
// XML must be quoted in the DAS but the quotes are an
// artifact of the DAS syntax so they are not part of the
@@ -1748,28 +1748,28 @@ yyreduce:
else
add_attribute(*type, *name, xml, 0);
}
-#line 1752 "das.tab.cc" /* yacc.c:1646 */
+#line 1752 "das.tab.cc" /* yacc.c:1661 */
break;
case 82:
-#line 425 "das.yy" /* yacc.c:1646 */
+#line 425 "das.yy" /* yacc.c:1661 */
{
*name = (yyvsp[0]);
}
-#line 1760 "das.tab.cc" /* yacc.c:1646 */
+#line 1760 "das.tab.cc" /* yacc.c:1661 */
break;
case 83:
-#line 429 "das.yy" /* yacc.c:1646 */
+#line 429 "das.yy" /* yacc.c:1661 */
{
add_alias( DAS_OBJ(arg)->get_top_level_attributes(),
TOP_OF_STACK, *name, string((yyvsp[0])) ) ;
}
-#line 1769 "das.tab.cc" /* yacc.c:1646 */
+#line 1769 "das.tab.cc" /* yacc.c:1661 */
break;
-#line 1773 "das.tab.cc" /* yacc.c:1646 */
+#line 1773 "das.tab.cc" /* yacc.c:1661 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/das.tab.hh b/das.tab.hh
index efcf24f..8c3664b 100644
--- a/das.tab.hh
+++ b/das.tab.hh
@@ -40,7 +40,7 @@
extern int dasdebug;
#endif
/* "%code requires" blocks. */
-#line 40 "das.yy" /* yacc.c:1909 */
+#line 40 "das.yy" /* yacc.c:1915 */
#define YYSTYPE char *
@@ -85,7 +85,7 @@ using namespace libdap ;
extern int das_line_num; /* defined in das.lex */
-#line 89 "das.tab.hh" /* yacc.c:1909 */
+#line 89 "das.tab.hh" /* yacc.c:1915 */
/* Token type. */
#ifndef YYTOKENTYPE
diff --git a/dds.tab.cc b/dds.tab.cc
index 9e0fd6b..a6ba517 100644
--- a/dds.tab.cc
+++ b/dds.tab.cc
@@ -1386,7 +1386,7 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 160 "dds.yy" /* yacc.c:1646 */
+#line 160 "dds.yy" /* yacc.c:1661 */
{
/* On entry to the parser, make the BaseType stack.
I use if (!ctor) here because in the tab.cc file,
@@ -1397,57 +1397,57 @@ yyreduce:
if (!ctor)
ctor = new stack<BaseType *>;
}
-#line 1401 "dds.tab.cc" /* yacc.c:1646 */
+#line 1401 "dds.tab.cc" /* yacc.c:1661 */
break;
case 3:
-#line 171 "dds.yy" /* yacc.c:1646 */
+#line 171 "dds.yy" /* yacc.c:1661 */
{
delete ctor; ctor = 0;
}
-#line 1409 "dds.tab.cc" /* yacc.c:1646 */
+#line 1409 "dds.tab.cc" /* yacc.c:1661 */
break;
case 6:
-#line 181 "dds.yy" /* yacc.c:1646 */
+#line 181 "dds.yy" /* yacc.c:1661 */
{
(yyval.boolean) = (yyvsp[-3].boolean) && (yyvsp[-1].boolean);
}
-#line 1417 "dds.tab.cc" /* yacc.c:1646 */
+#line 1417 "dds.tab.cc" /* yacc.c:1661 */
break;
case 7:
-#line 185 "dds.yy" /* yacc.c:1646 */
+#line 185 "dds.yy" /* yacc.c:1661 */
{
parse_error((parser_arg *)arg, NO_DDS_MSG, dds_line_num, (yyvsp[0].word));
error_exit_cleanup();
YYABORT;
}
-#line 1427 "dds.tab.cc" /* yacc.c:1646 */
+#line 1427 "dds.tab.cc" /* yacc.c:1661 */
break;
case 8:
-#line 193 "dds.yy" /* yacc.c:1646 */
+#line 193 "dds.yy" /* yacc.c:1661 */
{
(yyval.boolean) = true;
}
-#line 1435 "dds.tab.cc" /* yacc.c:1646 */
+#line 1435 "dds.tab.cc" /* yacc.c:1661 */
break;
case 9:
-#line 196 "dds.yy" /* yacc.c:1646 */
+#line 196 "dds.yy" /* yacc.c:1661 */
{ (yyval.boolean) = true; }
-#line 1441 "dds.tab.cc" /* yacc.c:1646 */
+#line 1441 "dds.tab.cc" /* yacc.c:1661 */
break;
case 10:
-#line 197 "dds.yy" /* yacc.c:1646 */
+#line 197 "dds.yy" /* yacc.c:1661 */
{ (yyval.boolean) = true; }
-#line 1447 "dds.tab.cc" /* yacc.c:1646 */
+#line 1447 "dds.tab.cc" /* yacc.c:1661 */
break;
case 11:
-#line 207 "dds.yy" /* yacc.c:1646 */
+#line 207 "dds.yy" /* yacc.c:1661 */
{
string smsg;
if (current->check_semantics(smsg)) {
@@ -1460,21 +1460,21 @@ yyreduce:
strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
(yyval.word)[ID_MAX-1] = '\0';
}
-#line 1464 "dds.tab.cc" /* yacc.c:1646 */
+#line 1464 "dds.tab.cc" /* yacc.c:1661 */
break;
case 12:
-#line 221 "dds.yy" /* yacc.c:1646 */
+#line 221 "dds.yy" /* yacc.c:1661 */
{
if( current ) delete current ;
current = ctor->top();
ctor->pop();
}
-#line 1474 "dds.tab.cc" /* yacc.c:1646 */
+#line 1474 "dds.tab.cc" /* yacc.c:1661 */
break;
case 13:
-#line 227 "dds.yy" /* yacc.c:1646 */
+#line 227 "dds.yy" /* yacc.c:1661 */
{
string smsg;
if (current->check_semantics(smsg)) {
@@ -1488,21 +1488,21 @@ yyreduce:
strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
(yyval.word)[ID_MAX-1] = '\0';
}
-#line 1492 "dds.tab.cc" /* yacc.c:1646 */
+#line 1492 "dds.tab.cc" /* yacc.c:1661 */
break;
case 14:
-#line 242 "dds.yy" /* yacc.c:1646 */
+#line 242 "dds.yy" /* yacc.c:1661 */
{
if( current ) delete current ;
current = ctor->top();
ctor->pop();
}
-#line 1502 "dds.tab.cc" /* yacc.c:1646 */
+#line 1502 "dds.tab.cc" /* yacc.c:1661 */
break;
case 15:
-#line 248 "dds.yy" /* yacc.c:1646 */
+#line 248 "dds.yy" /* yacc.c:1661 */
{
string smsg;
if (current->check_semantics(smsg)) {
@@ -1516,11 +1516,11 @@ yyreduce:
strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
(yyval.word)[ID_MAX-1] = '\0';
}
-#line 1520 "dds.tab.cc" /* yacc.c:1646 */
+#line 1520 "dds.tab.cc" /* yacc.c:1661 */
break;
case 16:
-#line 263 "dds.yy" /* yacc.c:1646 */
+#line 263 "dds.yy" /* yacc.c:1661 */
{
if (is_keyword(string((yyvsp[-1].word)), "array")) {
part = libdap::array;
@@ -1532,11 +1532,11 @@ yyreduce:
YYABORT;
}
}
-#line 1536 "dds.tab.cc" /* yacc.c:1646 */
+#line 1536 "dds.tab.cc" /* yacc.c:1661 */
break;
case 17:
-#line 275 "dds.yy" /* yacc.c:1646 */
+#line 275 "dds.yy" /* yacc.c:1661 */
{
if (is_keyword(string((yyvsp[-1].word)), "maps")) {
part = maps;
@@ -1548,21 +1548,21 @@ yyreduce:
YYABORT;
}
}
-#line 1552 "dds.tab.cc" /* yacc.c:1646 */
+#line 1552 "dds.tab.cc" /* yacc.c:1661 */
break;
case 18:
-#line 287 "dds.yy" /* yacc.c:1646 */
+#line 287 "dds.yy" /* yacc.c:1661 */
{
if( current ) delete current ;
current = ctor->top();
ctor->pop();
}
-#line 1562 "dds.tab.cc" /* yacc.c:1646 */
+#line 1562 "dds.tab.cc" /* yacc.c:1661 */
break;
case 19:
-#line 293 "dds.yy" /* yacc.c:1646 */
+#line 293 "dds.yy" /* yacc.c:1661 */
{
string smsg;
if (current->check_semantics(smsg)) {
@@ -1577,106 +1577,106 @@ yyreduce:
strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
(yyval.word)[ID_MAX-1] = '\0';
}
-#line 1581 "dds.tab.cc" /* yacc.c:1646 */
+#line 1581 "dds.tab.cc" /* yacc.c:1661 */
break;
case 20:
-#line 309 "dds.yy" /* yacc.c:1646 */
+#line 309 "dds.yy" /* yacc.c:1661 */
{
ostringstream msg;
msg << BAD_DECLARATION;
parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word));
YYABORT;
}
-#line 1592 "dds.tab.cc" /* yacc.c:1646 */
+#line 1592 "dds.tab.cc" /* yacc.c:1661 */
break;
case 21:
-#line 319 "dds.yy" /* yacc.c:1646 */
+#line 319 "dds.yy" /* yacc.c:1661 */
{
ctor->push(DDS_OBJ(arg)->get_factory()->NewStructure());
}
-#line 1600 "dds.tab.cc" /* yacc.c:1646 */
+#line 1600 "dds.tab.cc" /* yacc.c:1661 */
break;
case 22:
-#line 325 "dds.yy" /* yacc.c:1646 */
+#line 325 "dds.yy" /* yacc.c:1661 */
{
ctor->push(DDS_OBJ(arg)->get_factory()->NewSequence());
}
-#line 1608 "dds.tab.cc" /* yacc.c:1646 */
+#line 1608 "dds.tab.cc" /* yacc.c:1661 */
break;
case 23:
-#line 331 "dds.yy" /* yacc.c:1646 */
+#line 331 "dds.yy" /* yacc.c:1661 */
{
ctor->push(DDS_OBJ(arg)->get_factory()->NewGrid());
}
-#line 1616 "dds.tab.cc" /* yacc.c:1646 */
+#line 1616 "dds.tab.cc" /* yacc.c:1661 */
break;
case 24:
-#line 336 "dds.yy" /* yacc.c:1646 */
+#line 336 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewByte(); }
-#line 1622 "dds.tab.cc" /* yacc.c:1646 */
+#line 1622 "dds.tab.cc" /* yacc.c:1661 */
break;
case 25:
-#line 337 "dds.yy" /* yacc.c:1646 */
+#line 337 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt16(); }
-#line 1628 "dds.tab.cc" /* yacc.c:1646 */
+#line 1628 "dds.tab.cc" /* yacc.c:1661 */
break;
case 26:
-#line 338 "dds.yy" /* yacc.c:1646 */
+#line 338 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt16(); }
-#line 1634 "dds.tab.cc" /* yacc.c:1646 */
+#line 1634 "dds.tab.cc" /* yacc.c:1661 */
break;
case 27:
-#line 339 "dds.yy" /* yacc.c:1646 */
+#line 339 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt32(); }
-#line 1640 "dds.tab.cc" /* yacc.c:1646 */
+#line 1640 "dds.tab.cc" /* yacc.c:1661 */
break;
case 28:
-#line 340 "dds.yy" /* yacc.c:1646 */
+#line 340 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt32(); }
-#line 1646 "dds.tab.cc" /* yacc.c:1646 */
+#line 1646 "dds.tab.cc" /* yacc.c:1661 */
break;
case 29:
-#line 341 "dds.yy" /* yacc.c:1646 */
+#line 341 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat32(); }
-#line 1652 "dds.tab.cc" /* yacc.c:1646 */
+#line 1652 "dds.tab.cc" /* yacc.c:1661 */
break;
case 30:
-#line 342 "dds.yy" /* yacc.c:1646 */
+#line 342 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat64(); }
-#line 1658 "dds.tab.cc" /* yacc.c:1646 */
+#line 1658 "dds.tab.cc" /* yacc.c:1661 */
break;
case 31:
-#line 343 "dds.yy" /* yacc.c:1646 */
+#line 343 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewStr(); }
-#line 1664 "dds.tab.cc" /* yacc.c:1646 */
+#line 1664 "dds.tab.cc" /* yacc.c:1661 */
break;
case 32:
-#line 344 "dds.yy" /* yacc.c:1646 */
+#line 344 "dds.yy" /* yacc.c:1661 */
{ if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUrl(); }
-#line 1670 "dds.tab.cc" /* yacc.c:1646 */
+#line 1670 "dds.tab.cc" /* yacc.c:1661 */
break;
case 33:
-#line 347 "dds.yy" /* yacc.c:1646 */
+#line 347 "dds.yy" /* yacc.c:1661 */
{ current->set_name((yyvsp[0].word)); }
-#line 1676 "dds.tab.cc" /* yacc.c:1646 */
+#line 1676 "dds.tab.cc" /* yacc.c:1661 */
break;
case 49:
-#line 358 "dds.yy" /* yacc.c:1646 */
+#line 358 "dds.yy" /* yacc.c:1661 */
{
if (!check_int32((yyvsp[-1].word))) {
string msg = "In the dataset descriptor object:\n";
@@ -1696,19 +1696,19 @@ yyreduce:
(yyval.boolean) = true;
}
-#line 1700 "dds.tab.cc" /* yacc.c:1646 */
+#line 1700 "dds.tab.cc" /* yacc.c:1661 */
break;
case 50:
-#line 379 "dds.yy" /* yacc.c:1646 */
+#line 379 "dds.yy" /* yacc.c:1661 */
{
if (!id) id = new string((yyvsp[0].word));
}
-#line 1708 "dds.tab.cc" /* yacc.c:1646 */
+#line 1708 "dds.tab.cc" /* yacc.c:1661 */
break;
case 51:
-#line 383 "dds.yy" /* yacc.c:1646 */
+#line 383 "dds.yy" /* yacc.c:1661 */
{
if (!check_int32((yyvsp[0].word))) {
string msg = "In the dataset descriptor object:\n";
@@ -1730,19 +1730,19 @@ yyreduce:
delete id; id = 0;
}
-#line 1734 "dds.tab.cc" /* yacc.c:1646 */
+#line 1734 "dds.tab.cc" /* yacc.c:1661 */
break;
case 52:
-#line 405 "dds.yy" /* yacc.c:1646 */
+#line 405 "dds.yy" /* yacc.c:1661 */
{
(yyval.boolean) = true;
}
-#line 1742 "dds.tab.cc" /* yacc.c:1646 */
+#line 1742 "dds.tab.cc" /* yacc.c:1661 */
break;
case 53:
-#line 410 "dds.yy" /* yacc.c:1646 */
+#line 410 "dds.yy" /* yacc.c:1661 */
{
ostringstream msg;
msg << "In the dataset descriptor object:" << endl
@@ -1750,23 +1750,23 @@ yyreduce:
parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word));
YYABORT;
}
-#line 1754 "dds.tab.cc" /* yacc.c:1646 */
+#line 1754 "dds.tab.cc" /* yacc.c:1661 */
break;
case 54:
-#line 419 "dds.yy" /* yacc.c:1646 */
+#line 419 "dds.yy" /* yacc.c:1661 */
{ (*DDS_OBJ(arg)).set_dataset_name((yyvsp[0].word)); (yyval.boolean) = true;}
-#line 1760 "dds.tab.cc" /* yacc.c:1646 */
+#line 1760 "dds.tab.cc" /* yacc.c:1661 */
break;
case 55:
-#line 420 "dds.yy" /* yacc.c:1646 */
+#line 420 "dds.yy" /* yacc.c:1661 */
{ (*DDS_OBJ(arg)).set_dataset_name((yyvsp[0].word)); (yyval.boolean) = true; }
-#line 1766 "dds.tab.cc" /* yacc.c:1646 */
+#line 1766 "dds.tab.cc" /* yacc.c:1661 */
break;
case 56:
-#line 422 "dds.yy" /* yacc.c:1646 */
+#line 422 "dds.yy" /* yacc.c:1661 */
{
ostringstream msg;
msg << "Error parsing the dataset name." << endl
@@ -1774,11 +1774,11 @@ yyreduce:
parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word));
YYABORT;
}
-#line 1778 "dds.tab.cc" /* yacc.c:1646 */
+#line 1778 "dds.tab.cc" /* yacc.c:1661 */
break;
-#line 1782 "dds.tab.cc" /* yacc.c:1646 */
+#line 1782 "dds.tab.cc" /* yacc.c:1661 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/dds.tab.hh b/dds.tab.hh
index 436a5b4..4d35647 100644
--- a/dds.tab.hh
+++ b/dds.tab.hh
@@ -40,7 +40,7 @@
extern int ddsdebug;
#endif
/* "%code requires" blocks. */
-#line 47 "dds.yy" /* yacc.c:1909 */
+#line 47 "dds.yy" /* yacc.c:1915 */
#include "config_dap.h"
@@ -86,7 +86,7 @@ using namespace libdap;
extern int dds_line_num; /* defined in dds.lex */
-#line 90 "dds.tab.hh" /* yacc.c:1909 */
+#line 90 "dds.tab.hh" /* yacc.c:1915 */
/* Token type. */
#ifndef YYTOKENTYPE
@@ -117,12 +117,12 @@ extern int dds_line_num; /* defined in dds.lex */
union YYSTYPE
{
-#line 131 "dds.yy" /* yacc.c:1909 */
+#line 131 "dds.yy" /* yacc.c:1915 */
bool boolean;
char word[ID_MAX];
-#line 126 "dds.tab.hh" /* yacc.c:1909 */
+#line 126 "dds.tab.hh" /* yacc.c:1915 */
};
typedef union YYSTYPE YYSTYPE;
diff --git a/doxy.conf.in b/doxy.conf.in
index 7150f6c..de8cdd7 100644
--- a/doxy.conf.in
+++ b/doxy.conf.in
@@ -44,7 +44,7 @@ PROJECT_NUMBER = "Updated for version @PACKAGE_VERSION@"
# for a project that appears at the top of each page and should give viewer a
# quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF =
+PROJECT_BRIEF = "libdap4 is an implementation of OPeNDAP's DAP protocol."
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
# in the documentation. The maximum height of the logo should not exceed 55
@@ -58,7 +58,7 @@ PROJECT_LOGO =
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = docs
+OUTPUT_DIRECTORY =
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -68,7 +68,7 @@ OUTPUT_DIRECTORY = docs
# performance problems for the file system.
# The default value is: NO.
-CREATE_SUBDIRS = YES
+CREATE_SUBDIRS =
# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
# characters to appear in the names of generated files. If set to NO, non-ASCII
@@ -216,7 +216,7 @@ SEPARATE_MEMBER_PAGES = NO
# uses this value to replace tabs by spaces in code fragments.
# Minimum value: 1, maximum value: 16, default value: 4.
-TAB_SIZE = 8
+TAB_SIZE =
# This tag can be used to specify a number of aliases that act as commands in
# the documentation. An alias has the form:
@@ -840,6 +840,7 @@ EXCLUDE_PATTERNS = *.tab.cc \
*/tests/* \
*/gl/* \
*/old/* \
+ */unused/* \
*/win32/* \
*/VCPP/*
diff --git a/gl/Makefile.in b/gl/Makefile.in
index e6aa36c..36852f1 100644
--- a/gl/Makefile.in
+++ b/gl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in 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.
@@ -41,6 +40,51 @@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -59,8 +103,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = gl
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/conf/depcomp $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
$(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -121,37 +165,88 @@ am__dirstamp = $(am__leading_dot)dirstamp
am_libgnu_la_OBJECTS = localcharset.lo glthread/lock.lo \
glthread/threadlib.lo unistd.lo wctype-h.lo
libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
-libgnu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libgnu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libgnu_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libgnu_la_SOURCES) $(EXTRA_libgnu_la_SOURCES)
DIST_SOURCES = $(libgnu_la_SOURCES) $(EXTRA_libgnu_la_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
HEADERS = $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -186,6 +281,7 @@ ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
@@ -225,6 +321,7 @@ DAPLIB_REVISION = @DAPLIB_REVISION@
DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DVR = @DVR@
@@ -540,6 +637,7 @@ LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
@@ -573,6 +671,7 @@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
@@ -677,6 +776,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -719,7 +819,6 @@ libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -850,12 +949,14 @@ clean-noinstLIBRARIES:
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(noinst_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
glthread/$(am__dirstamp):
@$(MKDIR_P) glthread
@: > glthread/$(am__dirstamp)
@@ -866,15 +967,14 @@ glthread/lock.lo: glthread/$(am__dirstamp) \
glthread/$(DEPDIR)/$(am__dirstamp)
glthread/threadlib.lo: glthread/$(am__dirstamp) \
glthread/$(DEPDIR)/$(am__dirstamp)
-libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES)
- $(libgnu_la_LINK) $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
+
+libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) $(EXTRA_libgnu_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libgnu_la_LINK) $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f glthread/lock.$(OBJEXT)
- -rm -f glthread/lock.lo
- -rm -f glthread/threadlib.$(OBJEXT)
- -rm -f glthread/threadlib.lo
+ -rm -f glthread/*.$(OBJEXT)
+ -rm -f glthread/*.lo
distclean-compile:
-rm -f *.tab.c
@@ -897,28 +997,28 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at glthread/$(DEPDIR)/threadlib.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -928,22 +1028,25 @@ clean-libtool:
-rm -rf glthread/.libs glthread/_libs
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -958,57 +1061,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1024,12 +1082,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -1041,15 +1094,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -1058,6 +1107,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1094,13 +1158,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -1137,10 +1198,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
@@ -1230,25 +1296,24 @@ ps-am:
uninstall-am: uninstall-local
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
- ctags-recursive install install-am install-strip \
- tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am all-local check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
- ctags ctags-recursive distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-exec-local install-html \
+.MAKE: $(am__recursive_targets) all check install install-am \
+ install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+ check check-am clean clean-generic clean-libtool \
+ clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-exec-local install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
- tags-recursive uninstall uninstall-am uninstall-local
+ tags-am uninstall uninstall-am uninstall-local
# We need the following in order to create <alloca.h> when the system
diff --git a/lex.Error.cc b/lex.Error.cc
index d691f67..6242fd3 100644
--- a/lex.Error.cc
+++ b/lex.Error.cc
@@ -66,6 +66,7 @@ typedef int16_t flex_int16_t;
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;
@@ -172,7 +173,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-extern int Errorleng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t Errorleng;
extern FILE *Errorin, *Errorout;
@@ -198,11 +204,6 @@ extern FILE *Errorin, *Errorout;
#define unput(c) yyunput( c, (yytext_ptr) )
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -220,7 +221,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -290,8 +291,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when Errortext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int Errorleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t Errorleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -319,7 +320,7 @@ static void Error_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE Error_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE Error_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE Error_scan_bytes (yyconst char *bytes,int len );
+YY_BUFFER_STATE Error_scan_bytes (yyconst char *bytes,yy_size_t len );
void *Erroralloc (yy_size_t );
void *Errorrealloc (void *,yy_size_t );
@@ -378,7 +379,7 @@ static void yy_fatal_error (yyconst char msg[] );
#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;
@@ -593,7 +594,7 @@ void store_string();
#define YY_NO_INPUT 1
-#line 597 "lex.Error.cc"
+#line 598 "lex.Error.cc"
#define INITIAL 0
#define quote 1
@@ -634,7 +635,7 @@ FILE *Errorget_out (void );
void Errorset_out (FILE * out_str );
-int Errorget_leng (void );
+yy_size_t Errorget_leng (void );
char *Errorget_text (void );
@@ -682,7 +683,7 @@ static int input (void );
/* 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,
@@ -693,7 +694,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( Errorin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -779,7 +780,7 @@ YY_DECL
-#line 783 "lex.Error.cc"
+#line 784 "lex.Error.cc"
if ( !(yy_init) )
{
@@ -1000,7 +1001,7 @@ YY_RULE_SETUP
#line 144 "Error.lex"
ECHO;
YY_BREAK
-#line 1004 "lex.Error.cc"
+#line 1005 "lex.Error.cc"
case YY_END_OF_BUFFER:
{
@@ -1184,7 +1185,7 @@ static int yy_get_next_buffer (void)
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1198,7 +1199,7 @@ static int yy_get_next_buffer (void)
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1229,7 +1230,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ (yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -1351,7 +1352,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
+ yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -1375,7 +1376,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE:
{
if ( Errorwrap( ) )
- return EOF;
+ return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE;
@@ -1627,7 +1628,7 @@ void Errorpop_buffer_state (void)
*/
static void Errorensure_buffer_stack (void)
{
- int num_to_alloc;
+ yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
@@ -1724,12 +1725,11 @@ YY_BUFFER_STATE Error_scan_string (yyconst char * yystr )
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE Error_scan_bytes (yyconst char * yybytes, int _yybytes_len )
+YY_BUFFER_STATE Error_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n;
- int i;
+ yy_size_t n, i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -1811,7 +1811,7 @@ FILE *Errorget_out (void)
/** Get the length of the current token.
*
*/
-int Errorget_leng (void)
+yy_size_t Errorget_leng (void)
{
return Errorleng;
}
diff --git a/lex.ce_expr.cc b/lex.ce_expr.cc
index 6594a76..db7b906 100644
--- a/lex.ce_expr.cc
+++ b/lex.ce_expr.cc
@@ -66,6 +66,7 @@ typedef int16_t flex_int16_t;
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;
@@ -172,7 +173,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-extern int ce_exprleng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t ce_exprleng;
extern FILE *ce_exprin, *ce_exprout;
@@ -198,11 +204,6 @@ extern FILE *ce_exprin, *ce_exprout;
#define unput(c) yyunput( c, (yytext_ptr) )
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -220,7 +221,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -290,8 +291,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when ce_exprtext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int ce_exprleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t ce_exprleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -319,7 +320,7 @@ static void ce_expr_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE ce_expr_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE ce_expr_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE ce_expr_scan_bytes (yyconst char *bytes,int len );
+YY_BUFFER_STATE ce_expr_scan_bytes (yyconst char *bytes,yy_size_t len );
void *ce_expralloc (yy_size_t );
void *ce_exprrealloc (void *,yy_size_t );
@@ -378,7 +379,7 @@ static void yy_fatal_error (yyconst char msg[] );
#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;
@@ -611,7 +612,7 @@ static void store_op(int op);
scanners, but not here because it'll conflict with the url dereference
operator. 6/10/2002 jhrg
*/
-#line 615 "lex.ce_expr.cc"
+#line 616 "lex.ce_expr.cc"
#define INITIAL 0
#define quote 1
@@ -651,7 +652,7 @@ FILE *ce_exprget_out (void );
void ce_exprset_out (FILE * out_str );
-int ce_exprget_leng (void );
+yy_size_t ce_exprget_leng (void );
char *ce_exprget_text (void );
@@ -699,7 +700,7 @@ static int input (void );
/* 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,
@@ -710,7 +711,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( ce_exprin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -795,7 +796,7 @@ YY_DECL
#line 130 "ce_expr.lex"
-#line 799 "lex.ce_expr.cc"
+#line 800 "lex.ce_expr.cc"
if ( !(yy_init) )
{
@@ -1069,7 +1070,7 @@ YY_RULE_SETUP
#line 190 "ce_expr.lex"
ECHO;
YY_BREAK
-#line 1073 "lex.ce_expr.cc"
+#line 1074 "lex.ce_expr.cc"
case YY_END_OF_BUFFER:
{
@@ -1253,7 +1254,7 @@ static int yy_get_next_buffer (void)
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1267,7 +1268,7 @@ static int yy_get_next_buffer (void)
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1298,7 +1299,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ (yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -1420,7 +1421,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
+ yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -1444,7 +1445,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE:
{
if ( ce_exprwrap( ) )
- return EOF;
+ return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE;
@@ -1696,7 +1697,7 @@ void ce_exprpop_buffer_state (void)
*/
static void ce_exprensure_buffer_stack (void)
{
- int num_to_alloc;
+ yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
@@ -1793,12 +1794,11 @@ YY_BUFFER_STATE ce_expr_scan_string (yyconst char * yystr )
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE ce_expr_scan_bytes (yyconst char * yybytes, int _yybytes_len )
+YY_BUFFER_STATE ce_expr_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n;
- int i;
+ yy_size_t n, i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -1880,7 +1880,7 @@ FILE *ce_exprget_out (void)
/** Get the length of the current token.
*
*/
-int ce_exprget_leng (void)
+yy_size_t ce_exprget_leng (void)
{
return ce_exprleng;
}
diff --git a/lex.das.cc b/lex.das.cc
index d8623fa..155ae81 100644
--- a/lex.das.cc
+++ b/lex.das.cc
@@ -66,6 +66,7 @@ typedef int16_t flex_int16_t;
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;
@@ -172,7 +173,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-extern int dasleng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t dasleng;
extern FILE *dasin, *dasout;
@@ -198,11 +204,6 @@ extern FILE *dasin, *dasout;
#define unput(c) yyunput( c, (yytext_ptr) )
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -220,7 +221,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -290,8 +291,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when dastext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int dasleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t dasleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -319,7 +320,7 @@ static void das_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE das_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE das_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE das_scan_bytes (yyconst char *bytes,int len );
+YY_BUFFER_STATE das_scan_bytes (yyconst char *bytes,yy_size_t len );
void *dasalloc (yy_size_t );
void *dasrealloc (void *,yy_size_t );
@@ -378,7 +379,7 @@ static void yy_fatal_error (yyconst char msg[] );
#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;
@@ -711,7 +712,7 @@ static int start_line; /* used in quote and comment error handlers */
parens and colons while the DDS and expr scanners don't. It's too hard to
disambiguate functions when IDs have parens in them and adding colons
makes parsing the array projections hard. 10/31/2001 jhrg */
-#line 715 "lex.das.cc"
+#line 716 "lex.das.cc"
#define INITIAL 0
#define quote 1
@@ -753,7 +754,7 @@ FILE *dasget_out (void );
void dasset_out (FILE * out_str );
-int dasget_leng (void );
+yy_size_t dasget_leng (void );
char *dasget_text (void );
@@ -801,7 +802,7 @@ static int input (void );
/* 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,
@@ -812,7 +813,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( dasin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -897,7 +898,7 @@ YY_DECL
#line 136 "das.lex"
-#line 901 "lex.das.cc"
+#line 902 "lex.das.cc"
if ( !(yy_init) )
{
@@ -1181,7 +1182,7 @@ YY_RULE_SETUP
#line 200 "das.lex"
ECHO;
YY_BREAK
-#line 1185 "lex.das.cc"
+#line 1186 "lex.das.cc"
case YY_STATE_EOF(xml):
yyterminate();
@@ -1367,7 +1368,7 @@ static int yy_get_next_buffer (void)
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1381,7 +1382,7 @@ static int yy_get_next_buffer (void)
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1412,7 +1413,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ (yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -1534,7 +1535,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
+ yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -1558,7 +1559,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE:
{
if ( daswrap( ) )
- return EOF;
+ return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE;
@@ -1810,7 +1811,7 @@ void daspop_buffer_state (void)
*/
static void dasensure_buffer_stack (void)
{
- int num_to_alloc;
+ yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
@@ -1907,12 +1908,11 @@ YY_BUFFER_STATE das_scan_string (yyconst char * yystr )
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE das_scan_bytes (yyconst char * yybytes, int _yybytes_len )
+YY_BUFFER_STATE das_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n;
- int i;
+ yy_size_t n, i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -1994,7 +1994,7 @@ FILE *dasget_out (void)
/** Get the length of the current token.
*
*/
-int dasget_leng (void)
+yy_size_t dasget_leng (void)
{
return dasleng;
}
diff --git a/lex.dds.cc b/lex.dds.cc
index 3992803..f02a51b 100644
--- a/lex.dds.cc
+++ b/lex.dds.cc
@@ -66,6 +66,7 @@ typedef int16_t flex_int16_t;
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;
@@ -172,7 +173,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-extern int ddsleng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t ddsleng;
extern FILE *ddsin, *ddsout;
@@ -198,11 +204,6 @@ extern FILE *ddsin, *ddsout;
#define unput(c) yyunput( c, (yytext_ptr) )
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -220,7 +221,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -290,8 +291,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when ddstext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int ddsleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t ddsleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -319,7 +320,7 @@ static void dds_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE dds_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE dds_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE dds_scan_bytes (yyconst char *bytes,int len );
+YY_BUFFER_STATE dds_scan_bytes (yyconst char *bytes,yy_size_t len );
void *ddsalloc (yy_size_t );
void *ddsrealloc (void *,yy_size_t );
@@ -377,7 +378,7 @@ static void yy_fatal_error (yyconst char msg[] );
*/
#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;
@@ -683,7 +684,7 @@ static void store_word();
/* See das.lex for comments about the characters allowed in a WORD.
10/31/2001 jhrg */
-#line 687 "lex.dds.cc"
+#line 688 "lex.dds.cc"
#define INITIAL 0
#define comment 1
@@ -723,7 +724,7 @@ FILE *ddsget_out (void );
void ddsset_out (FILE * out_str );
-int ddsget_leng (void );
+yy_size_t ddsget_leng (void );
char *ddsget_text (void );
@@ -771,7 +772,7 @@ static int input (void );
/* 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,
@@ -782,7 +783,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- unsigned n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( ddsin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -867,7 +868,7 @@ YY_DECL
#line 120 "dds.lex"
-#line 871 "lex.dds.cc"
+#line 872 "lex.dds.cc"
if ( !(yy_init) )
{
@@ -1123,7 +1124,7 @@ YY_RULE_SETUP
#line 165 "dds.lex"
ECHO;
YY_BREAK
-#line 1127 "lex.dds.cc"
+#line 1128 "lex.dds.cc"
case YY_END_OF_BUFFER:
{
@@ -1307,7 +1308,7 @@ static int yy_get_next_buffer (void)
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1321,7 +1322,7 @@ static int yy_get_next_buffer (void)
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1352,7 +1353,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ (yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -1474,7 +1475,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
+ yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -1498,7 +1499,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE:
{
if ( ddswrap( ) )
- return EOF;
+ return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE;
@@ -1750,7 +1751,7 @@ void ddspop_buffer_state (void)
*/
static void ddsensure_buffer_stack (void)
{
- int num_to_alloc;
+ yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
@@ -1847,12 +1848,11 @@ YY_BUFFER_STATE dds_scan_string (yyconst char * yystr )
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE dds_scan_bytes (yyconst char * yybytes, int _yybytes_len )
+YY_BUFFER_STATE dds_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n;
- int i;
+ yy_size_t n, i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -1934,7 +1934,7 @@ FILE *ddsget_out (void)
/** Get the length of the current token.
*
*/
-int ddsget_leng (void)
+yy_size_t ddsget_leng (void)
{
return ddsleng;
}
diff --git a/libdap.spec b/libdap.spec
index 4fae110..147efee 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -1,6 +1,6 @@
Name: libdap
Summary: The C++ DAP2/DAP4 library from OPeNDAP
-Version: 3.18.3
+Version: 3.19.0
Release: 1%{?dist}
License: LGPLv2+
diff --git a/mime_util.cc b/mime_util.cc
index de62166..bfe9d05 100644
--- a/mime_util.cc
+++ b/mime_util.cc
@@ -795,6 +795,7 @@ void set_mime_ddx_boundary(ostream &strm, const string &boundary,
const string &cid, ObjectType type, EncodingType enc)
{
strm << "--" << boundary << CRLF;
+ // TODO - Bite the bullet and make the encoding UTF-8 as required by dap4. This will break a lot of tests but the baselines could be amended using a bash script and sed.
strm << "Content-Type: Text/xml; charset=iso-8859-1" << CRLF;
strm << "Content-Id: <" << cid << ">" << CRLF;
strm << "Content-Description: " << descrip[type] << CRLF ;
@@ -827,6 +828,7 @@ const size_t line_length = 1024;
just a newline (a common error).
@deprecated
+ @note FIXME: This function returns tainted data.
@param in Read from this stream (FILE *)
@return A string that contains the next header line or is empty indicating
the separator has been read.
@@ -854,6 +856,18 @@ string get_next_mime_header(FILE *in)
throw Error("I expected to find a MIME header, but got EOF instead.");
}
+/**
+ * This function and its companion read the next MIME header from an
+ * input stream (or FILE*) and return it as a string. The stream
+ * pointer is updated to the next line of input. It returns an empty
+ * string when the blank line ending the MIME headers is found.
+ *
+ * @note FIXME: This function returns tainted data.
+ *
+ * @param in Read the next header from the input stream
+ * @return Return the next header in a string; an empty string indicates
+ * all headers have been returned.
+ */
string get_next_mime_header(istream &in)
{
#if 0
@@ -992,6 +1006,8 @@ void read_multipart_headers(FILE *in, const string &content_type, const ObjectTy
{
bool ct = false, cd = false, ci = false;
+ // The function get_next_mime_header() returns tainted data. Fix this
+ // if we are going to use this code. jhrg 4/18/17
string header = get_next_mime_header(in);
while (!header.empty()) {
string name, value;
diff --git a/tests/DASTest b/tests/DASTest
index fef1fa3..d2348ea 100755
--- a/tests/DASTest
+++ b/tests/DASTest
@@ -1,17 +1,17 @@
#! /bin/sh
-# Generated from DASTest.at by GNU Autoconf 2.63.
+# Generated from DASTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
# This test suite is free software; the Free Software Foundation gives
# unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,23 +19,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -43,7 +35,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -54,7 +52,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -77,13 +75,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -93,15 +84,16 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -113,12 +105,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -130,330 +126,319 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # 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
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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 ;;
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
fi
-
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
- done
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-fi
-fi
+} # as_fn_mkdir_p
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
+ as_expr=false
fi
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_basename=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf at gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
-
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -470,10 +455,12 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -482,29 +469,18 @@ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell"
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -519,49 +495,29 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -591,6 +547,11 @@ at_errexit_p=false
# Shall we be verbose? ':' means no, empty means yes.
at_verbose=:
at_quiet=
+# Running several jobs in parallel, 0 means as many as test groups.
+at_jobs=1
+at_traceon=:
+at_trace_echo=:
+at_check_filter_trace=:
# Shall we keep the debug scripts? Must be `:' when the suite is
# run by a debug script, so that the script doesn't remove itself.
@@ -605,6 +566,8 @@ at_list_p=false
at_clean=false
# Test groups to run
at_groups=
+# Whether to rerun failed tests.
+at_recheck=
# Whether a write failure occurred
at_write_fail=0
@@ -618,10 +581,10 @@ esac
# Whether -C is in effect.
at_change_dir=false
+# Whether to enable colored test results.
+at_color=no
# List of the tested programs.
at_tested=''
-# List of the all the test groups.
-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40'
# As many question marks as there are digits in the last test group number.
# Used to normalize the test group numbers so that `ls' lists them in
# numerical order.
@@ -668,12 +631,14 @@ at_help_all="1;DASTest.at:31;DAS \$abs_srcdir/das-testsuite/bad_value_test.1.das
39;DASTest.at:69;DAS \$abs_srcdir/das-testsuite/test.8.das;das;
40;DASTest.at:70;DAS \$abs_srcdir/das-testsuite/test.9.das;das;
"
+# List of the all the test groups.
+at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
-# at_func_validate_ranges [NAME...]
-# ---------------------------------
-# Validate and normalize the test group number contained in each
-# variable NAME. Leading zeroes are treated as decimal.
-at_func_validate_ranges ()
+# at_fn_validate_ranges NAME...
+# -----------------------------
+# Validate and normalize the test group number contained in each variable
+# NAME. Leading zeroes are treated as decimal.
+at_fn_validate_ranges ()
{
for at_grp
do
@@ -684,7 +649,7 @@ at_func_validate_ranges ()
fi
case $at_value in
0*) # We want to treat leading 0 as decimal, like expr and test, but
- # at_func_arith treats it as octal if it uses $(( )).
+ # AS_VAR_ARITH treats it as octal if it uses $(( )).
# With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
# expr fork, but it is not worth the effort to determine if the
# shell supports XSI when the user can just avoid leading 0.
@@ -703,8 +668,8 @@ do
fi
case $at_option in
- *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
- *) at_optarg= ;;
+ *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+ *) at_optarg= ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -726,6 +691,19 @@ do
at_clean=:
;;
+ --color )
+ at_color=always
+ ;;
+ --color=* )
+ case $at_optarg in
+ no | never | none) at_color=never ;;
+ auto | tty | if-tty) at_color=auto ;;
+ always | yes | force) at_color=always ;;
+ *) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
+ as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
+ esac
+ ;;
+
--debug | -d )
at_debug_p=:
;;
@@ -740,29 +718,31 @@ do
;;
--trace | -x )
- at_traceon='set -x'; at_traceoff='set +x'
+ at_traceon='set -x'
+ at_trace_echo=echo
+ at_check_filter_trace=at_fn_filter_trace
;;
[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
- at_func_validate_ranges at_option
- at_groups="$at_groups$at_option "
+ at_fn_validate_ranges at_option
+ as_fn_append at_groups "$at_option$as_nl"
;;
# Ranges
[0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
at_range_start=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_start
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.* \('$at_range_start' \)/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,$p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
-[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
at_range_end=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '1,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
[0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -778,11 +758,10 @@ do
at_range_end=$at_range_start
at_range_start=$at_tmp
fi
- at_func_validate_ranges at_range_start at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.*\( '$at_range_start' \)/\1/' \
- -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
# Directory selection.
@@ -792,6 +771,25 @@ do
--directory=* )
at_change_dir=:
at_dir=$at_optarg
+ if test x- = "x$at_dir" ; then
+ at_dir=./-
+ fi
+ ;;
+
+ # Parallel execution.
+ --jobs | -j )
+ at_jobs=0
+ ;;
+ --jobs=* | -j[0-9]* )
+ if test -n "$at_optarg"; then
+ at_jobs=$at_optarg
+ else
+ at_jobs=`expr X$at_option : 'X-j\(.*\)'`
+ fi
+ case $at_jobs in *[!0-9]*)
+ at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
+ as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
+ esac
;;
# Keywords.
@@ -818,11 +816,12 @@ do
at_groups_selected=`$as_echo "$at_groups_selected" |
grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
done
- # Smash the newlines.
- at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
- tr "$as_nl" ' '
- `
- at_groups="$at_groups$at_groups_selected "
+ # Smash the keywords.
+ at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
+ as_fn_append at_groups "$at_groups_selected$as_nl"
+ ;;
+ --recheck)
+ at_recheck=:
;;
*=*)
@@ -830,14 +829,12 @@ do
# Reject names that are not valid shell variable names.
case $at_envvar in
'' | [0-9]* | *[!_$as_cr_alnum]* )
- { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
-$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
esac
at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
# Export now, but save eval for later and for debug scripts.
export $at_envvar
- at_debug_args="$at_debug_args $at_envvar='$at_value'"
+ as_fn_append at_debug_args " $at_envvar='$at_value'"
;;
*) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -848,19 +845,42 @@ $as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
done
# Verify our last option didn't require an argument
-if test -n "$at_prev"; then
- { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
-$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
- { (exit 1); exit 1; }; }
+if test -n "$at_prev"; then :
+ as_fn_error $? "\`$at_prev' requires an argument"
fi
+# The file containing the suite.
+at_suite_log=$at_dir/$as_me.log
# Selected test groups.
-if test -z "$at_groups"; then
+if test -z "$at_groups$at_recheck"; then
at_groups=$at_groups_all
else
+ if test -n "$at_recheck" && test -r "$at_suite_log"; then
+ at_oldfails=`sed -n '
+ /^Failed tests:$/,/^Skipped tests:$/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^Unexpected passes:$/,/^## Detailed failed tests/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^## Detailed failed tests/q
+ ' "$at_suite_log"`
+ as_fn_append at_groups "$at_oldfails$as_nl"
+ fi
# Sort the tests, removing duplicates.
- at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
+ at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
+fi
+
+if test x"$at_color" = xalways \
+ || { test x"$at_color" = xauto && test -t 1; }; then
+ at_red=`printf '\033[0;31m'`
+ at_grn=`printf '\033[0;32m'`
+ at_lgn=`printf '\033[1;32m'`
+ at_blu=`printf '\033[1;34m'`
+ at_std=`printf '\033[m'`
+else
+ at_red= at_grn= at_lgn= at_blu= at_std=
fi
# Help message.
@@ -871,16 +891,17 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
Run all the tests, or the selected TESTS, given by numeric ranges, and
save a detailed log file. Upon failure, create debugging scripts.
-You should not change environment variables unless explicitly passed
-as command line arguments. Set \`AUTOTEST_PATH' to select the executables
+Do not change environment variables directly. Instead, set them via
+command line arguments. Set \`AUTOTEST_PATH' to select the executables
to exercise. Each relative directory is expanded as build and source
-directories relatively to the top level of this distribution. E.g.,
+directories relative to the top level of this distribution.
+E.g., from within the build directory /tmp/foo-1.0, invoking this:
$ $0 AUTOTEST_PATH=bin
-possibly amounts into
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
- PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
+ PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
_ATEOF
cat <<_ATEOF || at_write_fail=1
@@ -895,9 +916,14 @@ cat <<_ATEOF || at_write_fail=1
Execution tuning:
-C, --directory=DIR
change to directory DIR before starting
+ --color[=never|auto|always]
+ enable colored test results on terminal, or always
+ -j, --jobs[=N]
+ Allow N jobs at once; infinite jobs with no arg (default 1)
-k, --keywords=KEYWORDS
select the tests matching all the comma-separated KEYWORDS
multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
+ --recheck select all tests that failed or passed unexpectedly last time
-e, --errexit abort as soon as a test fails; implies --debug
-v, --verbose force more detailed output
default for debugging scripts
@@ -915,64 +941,69 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-libdap 3.18.3 test suite: das-test test groups:
+libdap 3.19.0 test suite: das-test test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
_ATEOF
- # Passing at_groups is tricky. We cannot use it to form a literal string
- # or regexp because of the limitation of AIX awk. And Solaris' awk
- # doesn't grok more than 99 fields in a record, so we have to use `split'.
- # at_groups needs to be space-separated for this script to work.
- case $at_groups in
- *"$as_nl"* )
- at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
- esac
- $as_echo "$at_groups$as_nl$at_help_all" |
- awk 'BEGIN { FS = ";" }
- NR == 1 {
- for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
+ # Pass an empty line as separator between selected groups and help.
+ $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
+ awk 'NF == 1 && FS != ";" {
+ selected[$ 1] = 1
next
}
- {
+ /^$/ { FS = ";" }
+ NF > 0 {
if (selected[$ 1]) {
printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
- if ($ 4) printf " %s\n", $ 4
+ if ($ 4) {
+ lmax = 79
+ indent = " "
+ line = indent
+ len = length (line)
+ n = split ($ 4, a, " ")
+ for (i = 1; i <= n; i++) {
+ l = length (a[i]) + 1
+ if (i > 1 && len + l > lmax) {
+ print line
+ line = indent " " a[i]
+ len = length (line)
+ } else {
+ line = line " " a[i]
+ len += l
+ }
+ }
+ if (n)
+ print line
+ }
}
}' || at_write_fail=1
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (libdap 3.18.3)" &&
- cat <<\_ACEOF || at_write_fail=1
+ $as_echo "$as_me (libdap 3.19.0)" &&
+ cat <<\_ATEOF || at_write_fail=1
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This test suite is free software; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
-_ACEOF
+_ATEOF
exit $at_write_fail
fi
-# Should we print banners? at_groups is space-separated for entire test,
-# newline-separated if only a subset of the testsuite is run.
-case $at_groups in
- *' '*' '* | *"$as_nl"*"$as_nl"* )
- at_print_banners=: ;;
+# Should we print banners? Yes if more than one test is run.
+case $at_groups in #(
+ *$as_nl* )
+ at_print_banners=: ;; #(
* ) at_print_banners=false ;;
esac
-# Text for banner N, set to empty once printed.
+# Text for banner N, set to a single space once printed.
# Take any -C into account.
if $at_change_dir ; then
- if test x- = "x$at_dir" ; then
- at_dir=./-
- fi
test x != "x$at_dir" && cd "$at_dir" \
- || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
-$as_echo "$as_me: error: unable to change directory" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error $? "unable to change directory"
at_dir=`pwd`
fi
@@ -980,13 +1011,11 @@ fi
for at_file in atconfig atlocal
do
test -r $at_file || continue
- . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
-$as_echo "$as_me: error: invalid content: $at_file" >&2;}
- { (exit 1); exit 1; }; }
+ . ./$at_file || as_fn_error $? "invalid content: $at_file"
done
# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: ${at_top_build_prefix=$at_top_builddir}
+: "${at_top_build_prefix=$at_top_builddir}"
# Perform any assignments requested during argument parsing.
eval "$at_debug_args"
@@ -997,8 +1026,7 @@ if test -n "$at_top_srcdir"; then
builddir=../..
for at_dir_var in srcdir top_srcdir top_build_prefix
do
- at_val=`eval 'as_val=${'at_$at_dir_var'}
- $as_echo "$as_val"'`
+ eval at_val=\$at_$at_dir_var
case $at_val in
[\\/$]* | ?:[\\/]* ) at_prefix= ;;
*) at_prefix=../../ ;;
@@ -1007,9 +1035,9 @@ if test -n "$at_top_srcdir"; then
done
fi
-## ------------------- ##
-## Directory structure ##
-## ------------------- ##
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
# This is the set of directories and files used by this script
# (non-literals are capitalized):
@@ -1040,12 +1068,14 @@ fi
# The directory the whole suite works in.
# Should be absolute to let the user `cd' at will.
at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite.
+# The file containing the suite ($at_dir might have changed since earlier).
at_suite_log=$at_dir/$as_me.log
# The directory containing helper files per test group.
at_helper_dir=$at_suite_dir/at-groups
# Stop file: if it exists, do not start new jobs.
at_stop_file=$at_suite_dir/at-stop
+# The fifo used for the job dispatcher.
+at_job_fifo=$at_suite_dir/at-job-fifo
if $at_clean; then
test -d "$at_suite_dir" &&
@@ -1069,23 +1099,23 @@ for as_dir in $AUTOTEST_PATH $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
+ test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
case $as_dir in
[\\/]* | ?:[\\/]* )
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
;;
* )
if test -z "$at_top_build_prefix"; then
# Stand-alone test suite.
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
else
# Embedded test suite.
- at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
- at_path=$at_path$at_top_srcdir/$as_dir
+ as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
+ as_fn_append at_path "$at_top_srcdir/$as_dir"
fi
;;
esac
-done
+ done
IFS=$as_save_IFS
@@ -1099,7 +1129,7 @@ for as_dir in $at_path
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -d "$as_dir" || continue
+ test -d "$as_dir" || continue
case $as_dir in
[\\/]* | ?:[\\/]* ) ;;
* ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1107,15 +1137,18 @@ esac
case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
*$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
$PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
- *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
+ *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
esac
-done
+ done
IFS=$as_save_IFS
PATH=$at_new_path
export PATH
# Setting up the FDs.
+
+
+
# 5 is the log file. Not to be overwritten if `-d'.
if $at_debug_p; then
at_suite_log=/dev/null
@@ -1125,43 +1158,28 @@ fi
exec 5>>"$at_suite_log"
# Banners and logs.
-cat <<\_ASBOX
-## ----------------------------------- ##
-## libdap 3.18.3 test suite: das-test. ##
-## ----------------------------------- ##
-_ASBOX
+$as_echo "## ----------------------------------- ##
+## libdap 3.19.0 test suite: das-test. ##
+## ----------------------------------- ##"
{
- cat <<\_ASBOX
-## ----------------------------------- ##
-## libdap 3.18.3 test suite: das-test. ##
-## ----------------------------------- ##
-_ASBOX
+ $as_echo "## ----------------------------------- ##
+## libdap 3.19.0 test suite: das-test. ##
+## ----------------------------------- ##"
echo
$as_echo "$as_me: command line was:"
$as_echo " \$ $0 $at_cli_args"
echo
- # Try to find a few ChangeLogs in case it might help determining the
- # exact version. Use the relative dir: if the top dir is a symlink,
- # find will not follow it (and options to follow the links are not
- # portable), which would result in no output here. Prune directories
- # matching the package tarname, since they tend to be leftovers from
- # `make dist' or `make distcheck' and contain redundant or stale logs.
- if test -n "$at_top_srcdir"; then
- cat <<\_ASBOX
-## ----------- ##
-## ChangeLogs. ##
-## ----------- ##
-_ASBOX
+ # If ChangeLog exists, list a few lines in case it might help determining
+ # the exact version.
+ if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
+ $as_echo "## ---------- ##
+## ChangeLog. ##
+## ---------- ##"
+ echo
+ sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
echo
- for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
- do
- $as_echo "$as_me: $at_file:"
- sed 's/^/| /;10q' $at_file
- echo
- done
-
fi
{
@@ -1194,8 +1212,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
}
@@ -1212,53 +1230,80 @@ IFS=$as_save_IFS
} >&5
-## --------------- ##
-## Shell functions ##
-## --------------- ##
+## ------------------------- ##
+## Autotest shell functions. ##
+## ------------------------- ##
-# at_func_banner NUMBER
-# ---------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups
-# and this particular banner has not yet been printed.
-at_func_banner ()
+# at_fn_banner NUMBER
+# -------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups and
+# this particular banner has not yet been printed.
+at_fn_banner ()
{
$at_print_banners || return 0
eval at_banner_text=\$at_banner_text_$1
- test "x$at_banner_text" = x && return 0
- eval at_banner_text_$1=
- $as_echo "$as_nl$at_banner_text$as_nl"
-} # at_func_banner
+ test "x$at_banner_text" = "x " && return 0
+ eval "at_banner_text_$1=\" \""
+ if test -z "$at_banner_text"; then
+ $at_first || echo
+ else
+ $as_echo "$as_nl$at_banner_text$as_nl"
+ fi
+} # at_fn_banner
-# at_func_check_newline COMMAND
-# -----------------------------
-# Test if COMMAND includes a newline and, if so, print a message and return
-# exit code 1
-at_func_check_newline ()
+# at_fn_check_prepare_notrace REASON LINE
+# ---------------------------------------
+# Perform AT_CHECK preparations for the command at LINE for an untraceable
+# command; REASON is the reason for disabling tracing.
+at_fn_check_prepare_notrace ()
{
- case "$1" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
- return 1 ;;
- *) return 0 ;;
- esac
+ $at_trace_echo "Not enabling shell tracing (command contains $1)"
+ $as_echo "$2" >"$at_check_line_file"
+ at_check_trace=: at_check_filter=:
+ : >"$at_stdout"; : >"$at_stderr"
}
-# at_func_filter_trace EXIT-CODE
+# at_fn_check_prepare_trace LINE
# ------------------------------
-# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
-# and the other lines (on file "$at_stderr"). Return the exit code EXIT-CODE.
-at_func_filter_trace ()
+# Perform AT_CHECK preparations for the command at LINE for a traceable
+# command.
+at_fn_check_prepare_trace ()
+{
+ $as_echo "$1" >"$at_check_line_file"
+ at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
+ : >"$at_stdout"; : >"$at_stderr"
+}
+
+# at_fn_check_prepare_dynamic COMMAND LINE
+# ----------------------------------------
+# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
+# preparation function.
+at_fn_check_prepare_dynamic ()
{
+ case $1 in
+ *$as_nl*)
+ at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+ *)
+ at_fn_check_prepare_trace "$2" ;;
+ esac
+}
+
+# at_fn_filter_trace
+# ------------------
+# Remove the lines in the file "$at_stderr" generated by "set -x" and print
+# them to stderr.
+at_fn_filter_trace ()
+{
+ mv "$at_stderr" "$at_stder1"
grep '^ *+' "$at_stder1" >&2
grep -v '^ *+' "$at_stder1" >"$at_stderr"
- return $1
}
-# at_func_log_failure FILE-LIST
-# -----------------------------
+# at_fn_log_failure FILE-LIST
+# ---------------------------
# Copy the files in the list on stdout with a "> " prefix, and exit the shell
# with a failure exit code.
-at_func_log_failure ()
+at_fn_log_failure ()
{
for file
do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1266,56 +1311,62 @@ at_func_log_failure ()
exit 1
}
-# at_func_check_skip EXIT-CODE
-# ----------------------------
-# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
-# with that same exit code.
-at_func_check_skip ()
+# at_fn_check_skip EXIT-CODE LINE
+# -------------------------------
+# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
+# the test group subshell with that same exit code. Use LINE in any report
+# about test failure.
+at_fn_check_skip ()
{
case $1 in
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$2: hard failure"; exit 99;;
77) echo 77 > "$at_status_file"; exit 77;;
esac
}
-# at_func_check_status EXPECTED EXIT-CODE LINE
-# --------------------------------------------
-# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
-# Otherwise, if it is 77 exit the shell with that same exit code; if it is
-# anything else print an error message and fail the test.
-at_func_check_status ()
+# at_fn_check_status EXPECTED EXIT-CODE LINE
+# ------------------------------------------
+# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
+# Otherwise, if it is 77 or 99, exit the test group subshell with that same
+# exit code; if it is anything else print an error message referring to LINE,
+# and fail the test.
+at_fn_check_status ()
{
case $2 in
$1 ) ;;
77) echo 77 > "$at_status_file"; exit 77;;
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$3: hard failure"; exit 99;;
*) $as_echo "$3: exit code was $2, expected $1"
at_failed=:;;
esac
}
-# at_func_diff_devnull FILE
-# -------------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless
-# diff invocations.
-at_func_diff_devnull ()
+# at_fn_diff_devnull FILE
+# -----------------------
+# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
+# invocations.
+at_fn_diff_devnull ()
{
test -s "$1" || return 0
$at_diff "$at_devnull" "$1"
}
-# at_func_test NUMBER
-# -------------------
+# at_fn_test NUMBER
+# -----------------
# Parse out test NUMBER from the tail of this file.
-at_func_test ()
+at_fn_test ()
{
eval at_sed=\$at_sed$1
sed "$at_sed" "$at_myself" > "$at_test_source"
}
-# at_func_create_debugging_script
-# -------------------------------
+# at_fn_create_debugging_script
+# -----------------------------
# Create the debugging script $at_group_dir/run which will reproduce the
# current test group.
-at_func_create_debugging_script ()
+at_fn_create_debugging_script ()
{
{
echo "#! /bin/sh" &&
@@ -1327,34 +1378,13 @@ at_func_create_debugging_script ()
chmod +x "$at_group_dir/run"
}
-# at_func_arith
-# -------------
-# Arithmetic evaluation, avoids expr if the shell is sane. The
-# interpretation of leading zeroes is unspecified.
-#
-# subshell and eval are needed to keep Solaris sh from bailing out:
-if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
- # With "$@", bash does not split positional parameters:
- eval 'at_func_arith ()
- {
- at_func_arith_result=$(( $* ))
- }'
-else
- at_func_arith ()
- {
- at_func_arith_result=`expr "$@"`
- }
-fi
-
-## ---------------------- ##
-## End of shell functions ##
-## ---------------------- ##
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
{
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Tested programs. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
} >&5
@@ -1362,34 +1392,35 @@ _ASBOX
for at_program in : $at_tested
do
test "$at_program" = : && continue
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $at_program in
+ [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
+ * )
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -f "$as_dir/$at_program" && break
-done
+ test -f "$as_dir/$at_program" && break
+ done
IFS=$as_save_IFS
- if test -f "$as_dir/$at_program"; then
+ at_program_=$as_dir/$at_program ;;
+ esac
+ if test -f "$at_program_"; then
{
- $as_echo "$at_srcdir/DASTest.at:7: $as_dir/$at_program --version"
- "$as_dir/$at_program" --version </dev/null
+ $as_echo "$at_srcdir/DASTest.at:7: $at_program_ --version"
+ "$at_program_" --version </dev/null
echo
} >&5 2>&1
else
- { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
-$as_echo "$as_me: error: cannot find $at_program" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find $at_program" "$LINENO" 5
fi
done
{
- cat <<\_ASBOX
-## ------------------ ##
+ $as_echo "## ------------------ ##
## Running the tests. ##
-## ------------------ ##
-_ASBOX
+## ------------------ ##"
} >&5
at_start_date=`date`
@@ -1397,11 +1428,8 @@ at_start_time=`date +%s 2>/dev/null`
$as_echo "$as_me: starting at: $at_start_date" >&5
# Create the master directory if it doesn't already exist.
-test -d "$at_suite_dir" ||
- mkdir "$at_suite_dir" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
-$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
- { (exit 1); exit 1; }; }
+as_dir="$at_suite_dir"; as_fn_mkdir_p ||
+ as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
# Can we diff with `/dev/null'? DU 5.0 refuses.
if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1435,28 +1463,40 @@ BEGIN { FS="" }
if (test == "'"$at_group"'") exit
}' "$at_myself" > "$at_suite_dir/at-source-lines" &&
. "$at_suite_dir/at-source-lines" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
-$as_echo "$as_me: error: cannot create test line number cache" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot create test line number cache" "$LINENO" 5
rm -f "$at_suite_dir/at-source-lines"
+# Set number of jobs for `-j'; avoid more jobs than test groups.
+set X $at_groups; shift; at_max_jobs=$#
+if test $at_max_jobs -eq 0; then
+ at_jobs=1
+fi
+if test $at_jobs -ne 1 &&
+ { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
+ at_jobs=$at_max_jobs
+fi
+
+# If parallel mode, don't output banners, don't split summary lines.
+if test $at_jobs -ne 1; then
+ at_print_banners=false
+ at_quiet=:
+fi
+
# Set up helper dirs.
rm -rf "$at_helper_dir" &&
mkdir "$at_helper_dir" &&
cd "$at_helper_dir" &&
{ test -z "$at_groups" || mkdir $at_groups; } ||
-{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
-$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
- { (exit 1); exit 1; }; }
+as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
# Functions for running a test group. We leave the actual
# test group execution outside of a shell function in order
# to avoid hitting zsh 4.x exit status bugs.
-# at_func_group_prepare
-# ---------------------
-# Prepare running a test group
-at_func_group_prepare ()
+# at_fn_group_prepare
+# -------------------
+# Prepare for running a test group.
+at_fn_group_prepare ()
{
# The directory for additional per-group helper files.
at_job_dir=$at_helper_dir/$at_group
@@ -1490,56 +1530,20 @@ at_func_group_prepare ()
# Create a fresh directory for the next test group, and enter.
+ # If one already exists, the user may have invoked ./run from
+ # within that directory; we remove the contents, but not the
+ # directory itself, so that we aren't pulling the rug out from
+ # under the shell's notion of the current directory.
at_group_dir=$at_suite_dir/$at_group_normalized
at_group_log=$at_group_dir/$as_me.log
if test -d "$at_group_dir"; then
- find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
- rm -fr "$at_group_dir" ||
- { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
- fi
+ find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
+ rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
+fi ||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
# Be tolerant if the above `rm' was not able to remove the directory.
- { as_dir="$at_group_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$at_group_dir"; as_fn_mkdir_p
echo 0 > "$at_status_file"
@@ -1552,9 +1556,29 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
fi
}
-# at_func_group_postprocess
-# -------------------------
-at_func_group_postprocess ()
+# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
+# -------------------------------------------------
+# Declare the test group ORDINAL, located at LINE with group description DESC,
+# and residing under BANNER. Use PAD to align the status column.
+at_fn_group_banner ()
+{
+ at_setup_line="$2"
+ test -n "$5" && at_fn_banner $5
+ at_desc="$3"
+ case $1 in
+ [0-9]) at_desc_line=" $1: ";;
+ [0-9][0-9]) at_desc_line=" $1: " ;;
+ *) at_desc_line="$1: " ;;
+ esac
+ as_fn_append at_desc_line "$3$4"
+ $at_quiet $as_echo_n "$at_desc_line"
+ echo "# -*- compilation -*-" >> "$at_group_log"
+}
+
+# at_fn_group_postprocess
+# -----------------------
+# Perform cleanup after running a test group.
+at_fn_group_postprocess ()
{
# Be sure to come back to the suite directory, in particular
# since below we might `rm' the group directory we are in currently.
@@ -1567,6 +1591,7 @@ at_func_group_postprocess ()
report this failure to <opendap-tech at opendap.org>.
_ATEOF
$as_echo "$at_setup_line" >"$at_check_line_file"
+ at_status=99
fi
$at_verbose $as_echo_n "$at_group. $at_setup_line: "
$as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1575,31 +1600,41 @@ _ATEOF
at_msg="UNEXPECTED PASS"
at_res=xpass
at_errexit=$at_errexit_p
+ at_color=$at_red
;;
no:0)
at_msg="ok"
at_res=pass
at_errexit=false
+ at_color=$at_grn
;;
*:77)
at_msg='skipped ('`cat "$at_check_line_file"`')'
at_res=skip
at_errexit=false
+ at_color=$at_blu
+ ;;
+ no:* | *:99)
+ at_msg='FAILED ('`cat "$at_check_line_file"`')'
+ at_res=fail
+ at_errexit=$at_errexit_p
+ at_color=$at_red
;;
yes:*)
at_msg='expected failure ('`cat "$at_check_line_file"`')'
at_res=xfail
at_errexit=false
- ;;
- no:*)
- at_msg='FAILED ('`cat "$at_check_line_file"`')'
- at_res=fail
- at_errexit=$at_errexit_p
+ at_color=$at_lgn
;;
esac
echo "$at_res" > "$at_job_dir/$at_res"
- # Make sure there is a separator even with long titles.
- $as_echo " $at_msg"
+ # In parallel mode, output the summary line only afterwards.
+ if test $at_jobs -ne 1 && test -n "$at_verbose"; then
+ $as_echo "$at_desc_line $at_color$at_msg$at_std"
+ else
+ # Make sure there is a separator even with long titles.
+ $as_echo " $at_color$at_msg$at_std"
+ fi
at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
case $at_status in
0|77)
@@ -1614,9 +1649,13 @@ _ATEOF
$as_echo "$at_log_msg" >> "$at_group_log"
$as_echo "$at_log_msg" >&5
- # Cleanup the group directory, unless the user wants the files.
- if $at_debug_p; then
- at_func_create_debugging_script
+ # Cleanup the group directory, unless the user wants the files
+ # or the success was unexpected.
+ if $at_debug_p || test $at_res = xpass; then
+ at_fn_create_debugging_script
+ if test $at_res = xpass && $at_errexit; then
+ echo stop > "$at_stop_file"
+ fi
else
if test -d "$at_group_dir"; then
find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1633,7 +1672,7 @@ _ATEOF
# Upon failure, keep the group directory for autopsy, and create
# the debugging script. With -e, do not start any further tests.
- at_func_create_debugging_script
+ at_fn_create_debugging_script
if $at_errexit; then
echo stop > "$at_stop_file"
fi
@@ -1646,22 +1685,134 @@ _ATEOF
## Driver loop. ##
## ------------ ##
+
+if (set -m && set +m && set +b) >/dev/null 2>&1; then
+ set +b
+ at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
+else
+ at_job_control_on=: at_job_control_off=: at_job_group=
+fi
+
+for at_signal in 1 2 15; do
+ trap 'set +x; set +e
+ $at_job_control_off
+ at_signal='"$at_signal"'
+ echo stop > "$at_stop_file"
+ trap "" $at_signal
+ at_pgids=
+ for at_pgid in `jobs -p 2>/dev/null`; do
+ at_pgids="$at_pgids $at_job_group$at_pgid"
+ done
+ test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
+ wait
+ if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
+ echo >&2
+ fi
+ at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
+ set x $at_signame
+ test 1 -gt 2 && at_signame=$at_signal
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
+$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
+ as_fn_arith 128 + $at_signal && exit_status=$as_val
+ as_fn_exit $exit_status' $at_signal
+done
+
rm -f "$at_stop_file"
at_first=:
-for at_group in $at_groups; do
- at_func_group_prepare
- if cd "$at_group_dir" &&
- at_func_test $at_group &&
- . "$at_test_source"; then :; else
- { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
+if test $at_jobs -ne 1 &&
+ rm -f "$at_job_fifo" &&
+ test -n "$at_job_group" &&
+ ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
+then
+ # FIFO job dispatcher.
+
+ trap 'at_pids=
+ for at_pid in `jobs -p`; do
+ at_pids="$at_pids $at_job_group$at_pid"
+ done
+ if test -n "$at_pids"; then
+ at_sig=TSTP
+ test "${TMOUT+set}" = set && at_sig=STOP
+ kill -$at_sig $at_pids 2>/dev/null
+ fi
+ kill -STOP $$
+ test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
+
+ echo
+ # Turn jobs into a list of numbers, starting from 1.
+ at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
+
+ set X $at_joblist
+ shift
+ for at_group in $at_groups; do
+ $at_job_control_on 2>/dev/null
+ (
+ # Start one test group.
+ $at_job_control_off
+ if $at_first; then
+ exec 7>"$at_job_fifo"
+ else
+ exec 6<&-
+ fi
+ trap 'set +x; set +e
+ trap "" PIPE
+ echo stop > "$at_stop_file"
+ echo >&7
+ as_fn_exit 141' PIPE
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"
+ then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
- at_failed=:
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ echo >&7
+ ) &
+ $at_job_control_off
+ if $at_first; then
+ at_first=false
+ exec 6<"$at_job_fifo" 7>"$at_job_fifo"
+ fi
+ shift # Consume one token.
+ if test $# -gt 0; then :; else
+ read at_token <&6 || break
+ set x $*
+ fi
+ test -f "$at_stop_file" && break
+ done
+ exec 7>&-
+ # Read back the remaining ($at_jobs - 1) tokens.
+ set X $at_joblist
+ shift
+ if test $# -gt 0; then
+ shift
+ for at_job
+ do
+ read at_token
+ done <&6
fi
- at_func_group_postprocess
- test -f "$at_stop_file" && break
- at_first=false
-done
+ exec 6<&-
+ wait
+else
+ # Run serially, avoid forks and other potential surprises.
+ for at_group in $at_groups; do
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"; then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ test -f "$at_stop_file" && break
+ at_first=false
+ done
+fi
# Wrap up the test suite with summary statistics.
cd "$at_helper_dir"
@@ -1682,12 +1833,9 @@ set X $at_xfail_list; shift; at_xfail_count=$#
set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
set X $at_skip_list; shift; at_skip_count=$#
-at_func_arith $at_group_count - $at_skip_count
-at_run_count=$at_func_arith_result
-at_func_arith $at_xpass_count + $at_fail_count
-at_unexpected_count=$at_func_arith_result
-at_func_arith $at_xfail_count + $at_fail_count
-at_total_fail_count=$at_func_arith_result
+as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
+as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
+as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
# Back to the top directory.
cd "$at_dir"
@@ -1699,35 +1847,26 @@ at_stop_time=`date +%s 2>/dev/null`
$as_echo "$as_me: ending at: $at_stop_date" >&5
case $at_start_time,$at_stop_time in
[0-9]*,[0-9]*)
- at_func_arith $at_stop_time - $at_start_time
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_s / 60
- at_duration_m=$at_func_arith_result
- at_func_arith $at_duration_m / 60
- at_duration_h=$at_func_arith_result
- at_func_arith $at_duration_s % 60
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_m % 60
- at_duration_m=$at_func_arith_result
+ as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
+ as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
+ as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
+ as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
+ as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
$as_echo "$as_me: test suite duration: $at_duration" >&5
;;
esac
echo
-cat <<\_ASBOX
-## ------------- ##
+$as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
{
echo
- cat <<\_ASBOX
-## ------------- ##
+ $as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
} >&5
@@ -1745,12 +1884,14 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
at_result="$at_result $at_were run, one failed"
fi
at_result="$at_result unexpectedly and inhibited subsequent tests."
+ at_color=$at_red
else
# Don't you just love exponential explosion of the number of cases?
+ at_color=$at_red
case $at_xpass_count:$at_fail_count:$at_xfail_count in
# So far, so good.
- 0:0:0) at_result="$at_result $at_were successful." ;;
- 0:0:*) at_result="$at_result behaved as expected." ;;
+ 0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
+ 0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
# Some unexpected failures
0:*:0) at_result="$at_result $at_were run,
@@ -1796,18 +1937,16 @@ $at_skip_count tests were skipped." ;;
esac
if test $at_unexpected_count = 0; then
- echo "$at_result"
+ echo "$at_color$at_result$at_std"
echo "$at_result" >&5
else
- echo "ERROR: $at_result" >&2
+ echo "${at_color}ERROR: $at_result$at_std" >&2
echo "ERROR: $at_result" >&5
{
echo
- cat <<\_ASBOX
-## ------------------------ ##
+ $as_echo "## ------------------------ ##
## Summary of the failures. ##
-## ------------------------ ##
-_ASBOX
+## ------------------------ ##"
# Summary of failed and skipped tests.
if test $at_fail_count != 0; then
@@ -1826,11 +1965,9 @@ _ASBOX
echo
fi
if test $at_fail_count != 0; then
- cat <<\_ASBOX
-## ---------------------- ##
+ $as_echo "## ---------------------- ##
## Detailed failed tests. ##
-## ---------------------- ##
-_ASBOX
+## ---------------------- ##"
echo
for at_group in $at_fail_list
do
@@ -1862,19 +1999,21 @@ _ASBOX
_ASBOX
echo
- $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
+ if $at_debug_p; then
+ at_msg='per-test log files'
+ else
+ at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
+ fi
+ $as_echo "Please send $at_msg and all information you think might help:
To: <opendap-tech at opendap.org>
- Subject: [libdap 3.18.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [libdap 3.19.0] $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
+be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
"
- if test $at_debug_p = false; then
- echo
- echo 'You may investigate any problem if you feel able to do so, in which'
- echo 'case the test suite provides a good starting point. Its output may'
- $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
- echo
- fi
- exit 1
+ exit 1
fi
exit 0
@@ -1883,2442 +2022,1762 @@ exit 0
## Actual tests. ##
## ------------- ##
#AT_START_1
-# 1. DASTest.at:31: DAS $abs_srcdir/das-testsuite/bad_value_test.1.das
-at_setup_line='DASTest.at:31'
-at_desc="DAS \$abs_srcdir/das-testsuite/bad_value_test.1.das"
-$at_quiet $as_echo_n " 1: $at_desc"
+at_fn_group_banner 1 'DASTest.at:31' \
+ "DAS \$abs_srcdir/das-testsuite/bad_value_test.1.das" ""
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "1. DASTest.at:31: testing ..."
+ $as_echo "1. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:31: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/bad_value_test.1.das || true"
-echo DASTest.at:31 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true" "DASTest.at:31"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:31: diff -b -B \$abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr"
-echo DASTest.at:31 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr" "DASTest.at:31"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_1
#AT_START_2
-# 2. DASTest.at:32: DAS $abs_srcdir/das-testsuite/das.das
-at_setup_line='DASTest.at:32'
-at_desc="DAS \$abs_srcdir/das-testsuite/das.das"
-$at_quiet $as_echo_n " 2: $at_desc "
+at_fn_group_banner 2 'DASTest.at:32' \
+ "DAS \$abs_srcdir/das-testsuite/das.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "2. DASTest.at:32: testing ..."
+ $as_echo "2. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/das.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:32: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/das.das || true"
-echo DASTest.at:32 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true" "DASTest.at:32"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:32: diff -b -B \$abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/das.das.base stderr"
-echo DASTest.at:32 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr" "DASTest.at:32"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_2
#AT_START_3
-# 3. DASTest.at:33: DAS $abs_srcdir/das-testsuite/special.test.das
-at_setup_line='DASTest.at:33'
-at_desc="DAS \$abs_srcdir/das-testsuite/special.test.das"
-$at_quiet $as_echo_n " 3: $at_desc "
+at_fn_group_banner 3 'DASTest.at:33' \
+ "DAS \$abs_srcdir/das-testsuite/special.test.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "3. DASTest.at:33: testing ..."
+ $as_echo "3. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/special.test.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:33: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/special.test.das || true"
-echo DASTest.at:33 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true" "DASTest.at:33"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:33: diff -b -B \$abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/special.test.das.base stderr"
-echo DASTest.at:33 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr" "DASTest.at:33"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_3
#AT_START_4
-# 4. DASTest.at:34: DAS $abs_srcdir/das-testsuite/special.test.hdf.das
-at_setup_line='DASTest.at:34'
-at_desc="DAS \$abs_srcdir/das-testsuite/special.test.hdf.das"
-$at_quiet $as_echo_n " 4: $at_desc"
+at_fn_group_banner 4 'DASTest.at:34' \
+ "DAS \$abs_srcdir/das-testsuite/special.test.hdf.das" ""
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "4. DASTest.at:34: testing ..."
+ $as_echo "4. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:34: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/special.test.hdf.das || true"
-echo DASTest.at:34 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true" "DASTest.at:34"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:34: diff -b -B \$abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/special.test.hdf.das.base stderr"
-echo DASTest.at:34 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr" "DASTest.at:34"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_4
#AT_START_5
-# 5. DASTest.at:35: DAS $abs_srcdir/das-testsuite/test.1.das
-at_setup_line='DASTest.at:35'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.1.das"
-$at_quiet $as_echo_n " 5: $at_desc "
+at_fn_group_banner 5 'DASTest.at:35' \
+ "DAS \$abs_srcdir/das-testsuite/test.1.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "5. DASTest.at:35: testing ..."
+ $as_echo "5. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.1.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:35: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.1.das || true"
-echo DASTest.at:35 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true" "DASTest.at:35"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:35: diff -b -B \$abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.1.das.base stderr"
-echo DASTest.at:35 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr" "DASTest.at:35"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_5
#AT_START_6
-# 6. DASTest.at:36: DAS $abs_srcdir/das-testsuite/test.11.das
-at_setup_line='DASTest.at:36'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.11.das"
-$at_quiet $as_echo_n " 6: $at_desc "
+at_fn_group_banner 6 'DASTest.at:36' \
+ "DAS \$abs_srcdir/das-testsuite/test.11.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "6. DASTest.at:36: testing ..."
+ $as_echo "6. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.11.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:36: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.11.das || true"
-echo DASTest.at:36 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true" "DASTest.at:36"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:36: diff -b -B \$abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.11.das.base stderr"
-echo DASTest.at:36 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr" "DASTest.at:36"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_6
#AT_START_7
-# 7. DASTest.at:37: DAS $abs_srcdir/das-testsuite/test.12.das
-at_setup_line='DASTest.at:37'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.12.das"
-$at_quiet $as_echo_n " 7: $at_desc "
+at_fn_group_banner 7 'DASTest.at:37' \
+ "DAS \$abs_srcdir/das-testsuite/test.12.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "7. DASTest.at:37: testing ..."
+ $as_echo "7. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.12.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:37: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.12.das || true"
-echo DASTest.at:37 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true" "DASTest.at:37"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:37: diff -b -B \$abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.12.das.base stderr"
-echo DASTest.at:37 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr" "DASTest.at:37"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_7
#AT_START_8
-# 8. DASTest.at:38: DAS $abs_srcdir/das-testsuite/test.13.das
-at_setup_line='DASTest.at:38'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.13.das"
-$at_quiet $as_echo_n " 8: $at_desc "
+at_fn_group_banner 8 'DASTest.at:38' \
+ "DAS \$abs_srcdir/das-testsuite/test.13.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "8. DASTest.at:38: testing ..."
+ $as_echo "8. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.13.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:38: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.13.das || true"
-echo DASTest.at:38 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true" "DASTest.at:38"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:38: diff -b -B \$abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.13.das.base stderr"
-echo DASTest.at:38 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr" "DASTest.at:38"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_8
#AT_START_9
-# 9. DASTest.at:39: DAS $abs_srcdir/das-testsuite/test.14.das
-at_setup_line='DASTest.at:39'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.14.das"
-$at_quiet $as_echo_n " 9: $at_desc "
+at_fn_group_banner 9 'DASTest.at:39' \
+ "DAS \$abs_srcdir/das-testsuite/test.14.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "9. DASTest.at:39: testing ..."
+ $as_echo "9. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.14.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:39: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.14.das || true"
-echo DASTest.at:39 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true" "DASTest.at:39"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:39: diff -b -B \$abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.14.das.base stderr"
-echo DASTest.at:39 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr" "DASTest.at:39"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_9
#AT_START_10
-# 10. DASTest.at:40: DAS $abs_srcdir/das-testsuite/test.15.das
-at_setup_line='DASTest.at:40'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.15.das"
-$at_quiet $as_echo_n " 10: $at_desc "
+at_fn_group_banner 10 'DASTest.at:40' \
+ "DAS \$abs_srcdir/das-testsuite/test.15.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "10. DASTest.at:40: testing ..."
+ $as_echo "10. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.15.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:40: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.15.das || true"
-echo DASTest.at:40 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true" "DASTest.at:40"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:40: diff -b -B \$abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.15.das.base stderr"
-echo DASTest.at:40 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr" "DASTest.at:40"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_10
#AT_START_11
-# 11. DASTest.at:41: DAS $abs_srcdir/das-testsuite/test.16.das
-at_setup_line='DASTest.at:41'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.16.das"
-$at_quiet $as_echo_n " 11: $at_desc "
+at_fn_group_banner 11 'DASTest.at:41' \
+ "DAS \$abs_srcdir/das-testsuite/test.16.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "11. DASTest.at:41: testing ..."
+ $as_echo "11. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.16.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:41: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.16.das || true"
-echo DASTest.at:41 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true" "DASTest.at:41"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:41: diff -b -B \$abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.16.das.base stderr"
-echo DASTest.at:41 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr" "DASTest.at:41"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_11
#AT_START_12
-# 12. DASTest.at:42: DAS $abs_srcdir/das-testsuite/test.17.das
-at_setup_line='DASTest.at:42'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.17.das"
-$at_quiet $as_echo_n " 12: $at_desc "
+at_fn_group_banner 12 'DASTest.at:42' \
+ "DAS \$abs_srcdir/das-testsuite/test.17.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "12. DASTest.at:42: testing ..."
+ $as_echo "12. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.17.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:42: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.17.das || true"
-echo DASTest.at:42 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true" "DASTest.at:42"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:42: diff -b -B \$abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.17.das.base stderr"
-echo DASTest.at:42 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr" "DASTest.at:42"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_12
#AT_START_13
-# 13. DASTest.at:43: DAS $abs_srcdir/das-testsuite/test.18.das
-at_setup_line='DASTest.at:43'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.18.das"
-$at_quiet $as_echo_n " 13: $at_desc "
+at_fn_group_banner 13 'DASTest.at:43' \
+ "DAS \$abs_srcdir/das-testsuite/test.18.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "13. DASTest.at:43: testing ..."
+ $as_echo "13. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.18.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:43: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.18.das || true"
-echo DASTest.at:43 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true" "DASTest.at:43"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:43: diff -b -B \$abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.18.das.base stderr"
-echo DASTest.at:43 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr" "DASTest.at:43"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_13
#AT_START_14
-# 14. DASTest.at:44: DAS $abs_srcdir/das-testsuite/test.19.das
-at_setup_line='DASTest.at:44'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.19.das"
-$at_quiet $as_echo_n " 14: $at_desc "
+at_fn_group_banner 14 'DASTest.at:44' \
+ "DAS \$abs_srcdir/das-testsuite/test.19.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "14. DASTest.at:44: testing ..."
+ $as_echo "14. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.19.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:44: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.19.das || true"
-echo DASTest.at:44 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true" "DASTest.at:44"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:44: diff -b -B \$abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.19.das.base stderr"
-echo DASTest.at:44 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr" "DASTest.at:44"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_14
#AT_START_15
-# 15. DASTest.at:45: DAS $abs_srcdir/das-testsuite/test.1a.das
-at_setup_line='DASTest.at:45'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.1a.das"
-$at_quiet $as_echo_n " 15: $at_desc "
+at_fn_group_banner 15 'DASTest.at:45' \
+ "DAS \$abs_srcdir/das-testsuite/test.1a.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "15. DASTest.at:45: testing ..."
+ $as_echo "15. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:45: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.1a.das || true"
-echo DASTest.at:45 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true" "DASTest.at:45"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:45: diff -b -B \$abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.1a.das.base stderr"
-echo DASTest.at:45 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr" "DASTest.at:45"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_15
#AT_START_16
-# 16. DASTest.at:46: DAS $abs_srcdir/das-testsuite/test.2.das
-at_setup_line='DASTest.at:46'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.2.das"
-$at_quiet $as_echo_n " 16: $at_desc "
+at_fn_group_banner 16 'DASTest.at:46' \
+ "DAS \$abs_srcdir/das-testsuite/test.2.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "16. DASTest.at:46: testing ..."
+ $as_echo "16. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.2.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:46: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.2.das || true"
-echo DASTest.at:46 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true" "DASTest.at:46"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:46: diff -b -B \$abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.2.das.base stderr"
-echo DASTest.at:46 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr" "DASTest.at:46"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_16
#AT_START_17
-# 17. DASTest.at:47: DAS $abs_srcdir/das-testsuite/test.20.das
-at_setup_line='DASTest.at:47'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.20.das"
-$at_quiet $as_echo_n " 17: $at_desc "
+at_fn_group_banner 17 'DASTest.at:47' \
+ "DAS \$abs_srcdir/das-testsuite/test.20.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "17. DASTest.at:47: testing ..."
+ $as_echo "17. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.20.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:47: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.20.das || true"
-echo DASTest.at:47 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true" "DASTest.at:47"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:47: diff -b -B \$abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.20.das.base stderr"
-echo DASTest.at:47 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr" "DASTest.at:47"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_17
#AT_START_18
-# 18. DASTest.at:48: DAS $abs_srcdir/das-testsuite/test.21.das
-at_setup_line='DASTest.at:48'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.21.das"
-$at_quiet $as_echo_n " 18: $at_desc "
+at_fn_group_banner 18 'DASTest.at:48' \
+ "DAS \$abs_srcdir/das-testsuite/test.21.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "18. DASTest.at:48: testing ..."
+ $as_echo "18. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.21.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:48: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.21.das || true"
-echo DASTest.at:48 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true" "DASTest.at:48"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:48: diff -b -B \$abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.21.das.base stderr"
-echo DASTest.at:48 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr" "DASTest.at:48"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_18
#AT_START_19
-# 19. DASTest.at:49: DAS $abs_srcdir/das-testsuite/test.22.das
-at_setup_line='DASTest.at:49'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.22.das"
-$at_quiet $as_echo_n " 19: $at_desc "
+at_fn_group_banner 19 'DASTest.at:49' \
+ "DAS \$abs_srcdir/das-testsuite/test.22.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "19. DASTest.at:49: testing ..."
+ $as_echo "19. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.22.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:49: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.22.das || true"
-echo DASTest.at:49 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true" "DASTest.at:49"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:49: diff -b -B \$abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.22.das.base stderr"
-echo DASTest.at:49 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr" "DASTest.at:49"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_19
#AT_START_20
-# 20. DASTest.at:50: DAS $abs_srcdir/das-testsuite/test.23.das
-at_setup_line='DASTest.at:50'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.23.das"
-$at_quiet $as_echo_n " 20: $at_desc "
+at_fn_group_banner 20 'DASTest.at:50' \
+ "DAS \$abs_srcdir/das-testsuite/test.23.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "20. DASTest.at:50: testing ..."
+ $as_echo "20. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.23.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:50: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.23.das || true"
-echo DASTest.at:50 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true" "DASTest.at:50"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:50: diff -b -B \$abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.23.das.base stderr"
-echo DASTest.at:50 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr" "DASTest.at:50"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_20
#AT_START_21
-# 21. DASTest.at:51: DAS $abs_srcdir/das-testsuite/test.24.das
-at_setup_line='DASTest.at:51'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.24.das"
-$at_quiet $as_echo_n " 21: $at_desc "
+at_fn_group_banner 21 'DASTest.at:51' \
+ "DAS \$abs_srcdir/das-testsuite/test.24.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "21. DASTest.at:51: testing ..."
+ $as_echo "21. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.24.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:51: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.24.das || true"
-echo DASTest.at:51 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true" "DASTest.at:51"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:51: diff -b -B \$abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.24.das.base stderr"
-echo DASTest.at:51 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr" "DASTest.at:51"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_21
#AT_START_22
-# 22. DASTest.at:52: DAS $abs_srcdir/das-testsuite/test.25.das
-at_setup_line='DASTest.at:52'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.25.das"
-$at_quiet $as_echo_n " 22: $at_desc "
+at_fn_group_banner 22 'DASTest.at:52' \
+ "DAS \$abs_srcdir/das-testsuite/test.25.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "22. DASTest.at:52: testing ..."
+ $as_echo "22. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.25.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:52: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.25.das || true"
-echo DASTest.at:52 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true" "DASTest.at:52"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:52: diff -b -B \$abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.25.das.base stderr"
-echo DASTest.at:52 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr" "DASTest.at:52"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_22
#AT_START_23
-# 23. DASTest.at:53: DAS $abs_srcdir/das-testsuite/test.26.das
-at_setup_line='DASTest.at:53'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.26.das"
-$at_quiet $as_echo_n " 23: $at_desc "
+at_fn_group_banner 23 'DASTest.at:53' \
+ "DAS \$abs_srcdir/das-testsuite/test.26.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "23. DASTest.at:53: testing ..."
+ $as_echo "23. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.26.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:53: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.26.das || true"
-echo DASTest.at:53 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true" "DASTest.at:53"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:53: diff -b -B \$abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.26.das.base stderr"
-echo DASTest.at:53 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr" "DASTest.at:53"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_23
#AT_START_24
-# 24. DASTest.at:54: DAS $abs_srcdir/das-testsuite/test.27.das
-at_setup_line='DASTest.at:54'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.27.das"
-$at_quiet $as_echo_n " 24: $at_desc "
+at_fn_group_banner 24 'DASTest.at:54' \
+ "DAS \$abs_srcdir/das-testsuite/test.27.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "24. DASTest.at:54: testing ..."
+ $as_echo "24. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.27.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:54: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.27.das || true"
-echo DASTest.at:54 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true" "DASTest.at:54"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:54: diff -b -B \$abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.27.das.base stderr"
-echo DASTest.at:54 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr" "DASTest.at:54"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_24
#AT_START_25
-# 25. DASTest.at:55: DAS $abs_srcdir/das-testsuite/test.28.das
-at_setup_line='DASTest.at:55'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.28.das"
-$at_quiet $as_echo_n " 25: $at_desc "
+at_fn_group_banner 25 'DASTest.at:55' \
+ "DAS \$abs_srcdir/das-testsuite/test.28.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "25. DASTest.at:55: testing ..."
+ $as_echo "25. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.28.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:55: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.28.das || true"
-echo DASTest.at:55 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true" "DASTest.at:55"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:55: diff -b -B \$abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.28.das.base stderr"
-echo DASTest.at:55 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr" "DASTest.at:55"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_25
#AT_START_26
-# 26. DASTest.at:56: DAS $abs_srcdir/das-testsuite/test.29.das
-at_setup_line='DASTest.at:56'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.29.das"
-$at_quiet $as_echo_n " 26: $at_desc "
+at_fn_group_banner 26 'DASTest.at:56' \
+ "DAS \$abs_srcdir/das-testsuite/test.29.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "26. DASTest.at:56: testing ..."
+ $as_echo "26. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.29.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:56: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.29.das || true"
-echo DASTest.at:56 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true" "DASTest.at:56"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:56: diff -b -B \$abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.29.das.base stderr"
-echo DASTest.at:56 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr" "DASTest.at:56"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_26
#AT_START_27
-# 27. DASTest.at:57: DAS $abs_srcdir/das-testsuite/test.3.das
-at_setup_line='DASTest.at:57'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.3.das"
-$at_quiet $as_echo_n " 27: $at_desc "
+at_fn_group_banner 27 'DASTest.at:57' \
+ "DAS \$abs_srcdir/das-testsuite/test.3.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "27. DASTest.at:57: testing ..."
+ $as_echo "27. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.3.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:57: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.3.das || true"
-echo DASTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true" "DASTest.at:57"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:57: diff -b -B \$abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.3.das.base stderr"
-echo DASTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr" "DASTest.at:57"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_27
#AT_START_28
-# 28. DASTest.at:58: DAS $abs_srcdir/das-testsuite/test.3.Z.das
-at_setup_line='DASTest.at:58'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.3.Z.das"
-$at_quiet $as_echo_n " 28: $at_desc "
+at_fn_group_banner 28 'DASTest.at:58' \
+ "DAS \$abs_srcdir/das-testsuite/test.3.Z.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "28. DASTest.at:58: testing ..."
+ $as_echo "28. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:58: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.3.Z.das || true"
-echo DASTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true" "DASTest.at:58"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:58: diff -b -B \$abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.3.Z.das.base stderr"
-echo DASTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr" "DASTest.at:58"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_28
#AT_START_29
-# 29. DASTest.at:59: DAS $abs_srcdir/das-testsuite/test.30.das
-at_setup_line='DASTest.at:59'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.30.das"
-$at_quiet $as_echo_n " 29: $at_desc "
+at_fn_group_banner 29 'DASTest.at:59' \
+ "DAS \$abs_srcdir/das-testsuite/test.30.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "29. DASTest.at:59: testing ..."
+ $as_echo "29. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.30.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:59: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.30.das || true"
-echo DASTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true" "DASTest.at:59"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:59: diff -b -B \$abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.30.das.base stderr"
-echo DASTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr" "DASTest.at:59"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_29
#AT_START_30
-# 30. DASTest.at:60: DAS $abs_srcdir/das-testsuite/test.31.das
-at_setup_line='DASTest.at:60'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.31.das"
-$at_quiet $as_echo_n " 30: $at_desc "
+at_fn_group_banner 30 'DASTest.at:60' \
+ "DAS \$abs_srcdir/das-testsuite/test.31.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "30. DASTest.at:60: testing ..."
+ $as_echo "30. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.31.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:60: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.31.das || true"
-echo DASTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true" "DASTest.at:60"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:60: diff -b -B \$abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.31.das.base stderr"
-echo DASTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr" "DASTest.at:60"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_30
#AT_START_31
-# 31. DASTest.at:61: DAS $abs_srcdir/das-testsuite/test.32.das
-at_setup_line='DASTest.at:61'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.32.das"
-$at_quiet $as_echo_n " 31: $at_desc "
+at_fn_group_banner 31 'DASTest.at:61' \
+ "DAS \$abs_srcdir/das-testsuite/test.32.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "31. DASTest.at:61: testing ..."
+ $as_echo "31. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.32.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:61: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.32.das || true"
-echo DASTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true" "DASTest.at:61"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:61: diff -b -B \$abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.32.das.base stderr"
-echo DASTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr" "DASTest.at:61"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_31
#AT_START_32
-# 32. DASTest.at:62: DAS $abs_srcdir/das-testsuite/test.33.das
-at_setup_line='DASTest.at:62'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.33.das"
-$at_quiet $as_echo_n " 32: $at_desc "
+at_fn_group_banner 32 'DASTest.at:62' \
+ "DAS \$abs_srcdir/das-testsuite/test.33.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "32. DASTest.at:62: testing ..."
+ $as_echo "32. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.33.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:62: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.33.das || true"
-echo DASTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true" "DASTest.at:62"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:62: diff -b -B \$abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.33.das.base stderr"
-echo DASTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr" "DASTest.at:62"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_32
#AT_START_33
-# 33. DASTest.at:63: DAS $abs_srcdir/das-testsuite/test.34.das
-at_setup_line='DASTest.at:63'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.34.das"
-$at_quiet $as_echo_n " 33: $at_desc "
+at_fn_group_banner 33 'DASTest.at:63' \
+ "DAS \$abs_srcdir/das-testsuite/test.34.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "33. DASTest.at:63: testing ..."
+ $as_echo "33. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.34.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:63: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.34.das || true"
-echo DASTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true" "DASTest.at:63"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:63: diff -b -B \$abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.34.das.base stderr"
-echo DASTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr" "DASTest.at:63"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_33
#AT_START_34
-# 34. DASTest.at:64: DAS $abs_srcdir/das-testsuite/test.35.das
-at_setup_line='DASTest.at:64'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.35.das"
-$at_quiet $as_echo_n " 34: $at_desc "
+at_fn_group_banner 34 'DASTest.at:64' \
+ "DAS \$abs_srcdir/das-testsuite/test.35.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "34. DASTest.at:64: testing ..."
+ $as_echo "34. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.35.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:64: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.35.das || true"
-echo DASTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true" "DASTest.at:64"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:64: diff -b -B \$abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.35.das.base stderr"
-echo DASTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr" "DASTest.at:64"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_34
#AT_START_35
-# 35. DASTest.at:65: DAS $abs_srcdir/das-testsuite/test.4.das
-at_setup_line='DASTest.at:65'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.4.das"
-$at_quiet $as_echo_n " 35: $at_desc "
+at_fn_group_banner 35 'DASTest.at:65' \
+ "DAS \$abs_srcdir/das-testsuite/test.4.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "35. DASTest.at:65: testing ..."
+ $as_echo "35. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.4.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:65: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.4.das || true"
-echo DASTest.at:65 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true" "DASTest.at:65"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:65: diff -b -B \$abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.4.das.base stderr"
-echo DASTest.at:65 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr" "DASTest.at:65"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_35
#AT_START_36
-# 36. DASTest.at:66: DAS $abs_srcdir/das-testsuite/test.5.das
-at_setup_line='DASTest.at:66'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.5.das"
-$at_quiet $as_echo_n " 36: $at_desc "
+at_fn_group_banner 36 'DASTest.at:66' \
+ "DAS \$abs_srcdir/das-testsuite/test.5.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "36. DASTest.at:66: testing ..."
+ $as_echo "36. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.5.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:66: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.5.das || true"
-echo DASTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true" "DASTest.at:66"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:66: diff -b -B \$abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.5.das.base stderr"
-echo DASTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr" "DASTest.at:66"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_36
#AT_START_37
-# 37. DASTest.at:67: DAS $abs_srcdir/das-testsuite/test.6.das
-at_setup_line='DASTest.at:67'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.6.das"
-$at_quiet $as_echo_n " 37: $at_desc "
+at_fn_group_banner 37 'DASTest.at:67' \
+ "DAS \$abs_srcdir/das-testsuite/test.6.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "37. DASTest.at:67: testing ..."
+ $as_echo "37. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.6.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:67: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.6.das || true"
-echo DASTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true" "DASTest.at:67"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:67: diff -b -B \$abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.6.das.base stderr"
-echo DASTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr" "DASTest.at:67"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_37
#AT_START_38
-# 38. DASTest.at:68: DAS $abs_srcdir/das-testsuite/test.7.das
-at_setup_line='DASTest.at:68'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.7.das"
-$at_quiet $as_echo_n " 38: $at_desc "
+at_fn_group_banner 38 'DASTest.at:68' \
+ "DAS \$abs_srcdir/das-testsuite/test.7.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "38. DASTest.at:68: testing ..."
+ $as_echo "38. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.7.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:68: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.7.das || true"
-echo DASTest.at:68 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true" "DASTest.at:68"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:68: diff -b -B \$abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.7.das.base stderr"
-echo DASTest.at:68 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr" "DASTest.at:68"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_38
#AT_START_39
-# 39. DASTest.at:69: DAS $abs_srcdir/das-testsuite/test.8.das
-at_setup_line='DASTest.at:69'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.8.das"
-$at_quiet $as_echo_n " 39: $at_desc "
+at_fn_group_banner 39 'DASTest.at:69' \
+ "DAS \$abs_srcdir/das-testsuite/test.8.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "39. DASTest.at:69: testing ..."
+ $as_echo "39. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.8.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:69: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.8.das || true"
-echo DASTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true" "DASTest.at:69"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:69: diff -b -B \$abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.8.das.base stderr"
-echo DASTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr" "DASTest.at:69"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_39
#AT_START_40
-# 40. DASTest.at:70: DAS $abs_srcdir/das-testsuite/test.9.das
-at_setup_line='DASTest.at:70'
-at_desc="DAS \$abs_srcdir/das-testsuite/test.9.das"
-$at_quiet $as_echo_n " 40: $at_desc "
+at_fn_group_banner 40 'DASTest.at:70' \
+ "DAS \$abs_srcdir/das-testsuite/test.9.das" " "
at_xfail=no
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "40. DASTest.at:70: testing ..."
+ $as_echo "40. $at_setup_line: testing $at_desc ..."
$at_traceon
#Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.9.das needs to be true whether the
#output is printed to stdout or stderr
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:70: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.9.das || true"
-echo DASTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true"; then
- ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true" "DASTest.at:70"
+( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || 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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
#Need to compare either stdout or stderr because of the directory the above
#AT_CHECK prints output to
-{ $at_traceoff
+{ set +x
$as_echo "$at_srcdir/DASTest.at:70: diff -b -B \$abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.9.das.base stderr"
-echo DASTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr" "DASTest.at:70"
+( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.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_func_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_40
diff --git a/tests/DDSTest b/tests/DDSTest
index dc0a028..1bad379 100755
--- a/tests/DDSTest
+++ b/tests/DDSTest
@@ -1,17 +1,17 @@
#! /bin/sh
-# Generated from DDSTest.at by GNU Autoconf 2.63.
+# Generated from DDSTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
# This test suite is free software; the Free Software Foundation gives
# unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,23 +19,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -43,7 +35,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -54,7 +52,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -77,13 +75,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -93,15 +84,16 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -113,12 +105,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -130,330 +126,319 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # 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
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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 ;;
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
fi
-
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
- done
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-fi
-fi
+} # as_fn_mkdir_p
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
+ as_expr=false
fi
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_basename=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf at gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
-
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -470,10 +455,12 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -482,29 +469,18 @@ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell"
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -519,49 +495,29 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -591,6 +547,11 @@ at_errexit_p=false
# Shall we be verbose? ':' means no, empty means yes.
at_verbose=:
at_quiet=
+# Running several jobs in parallel, 0 means as many as test groups.
+at_jobs=1
+at_traceon=:
+at_trace_echo=:
+at_check_filter_trace=:
# Shall we keep the debug scripts? Must be `:' when the suite is
# run by a debug script, so that the script doesn't remove itself.
@@ -605,6 +566,8 @@ at_list_p=false
at_clean=false
# Test groups to run
at_groups=
+# Whether to rerun failed tests.
+at_recheck=
# Whether a write failure occurred
at_write_fail=0
@@ -618,10 +581,10 @@ esac
# Whether -C is in effect.
at_change_dir=false
+# Whether to enable colored test results.
+at_color=no
# List of the tested programs.
at_tested=''
-# List of the all the test groups.
-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35'
# As many question marks as there are digits in the last test group number.
# Used to normalize the test group numbers so that `ls' lists them in
# numerical order.
@@ -663,12 +626,14 @@ at_help_all="1;DDSTest.at:48;DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.hacked
34;DDSTest.at:86;DDS \$abs_srcdir/dds-testsuite/test.25.dds;dds;
35;DDSTest.at:87;DDS \$abs_srcdir/dds-testsuite/test.26.dds;dds;
"
+# List of the all the test groups.
+at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
-# at_func_validate_ranges [NAME...]
-# ---------------------------------
-# Validate and normalize the test group number contained in each
-# variable NAME. Leading zeroes are treated as decimal.
-at_func_validate_ranges ()
+# at_fn_validate_ranges NAME...
+# -----------------------------
+# Validate and normalize the test group number contained in each variable
+# NAME. Leading zeroes are treated as decimal.
+at_fn_validate_ranges ()
{
for at_grp
do
@@ -679,7 +644,7 @@ at_func_validate_ranges ()
fi
case $at_value in
0*) # We want to treat leading 0 as decimal, like expr and test, but
- # at_func_arith treats it as octal if it uses $(( )).
+ # AS_VAR_ARITH treats it as octal if it uses $(( )).
# With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
# expr fork, but it is not worth the effort to determine if the
# shell supports XSI when the user can just avoid leading 0.
@@ -705,8 +670,8 @@ do
fi
case $at_option in
- *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
- *) at_optarg= ;;
+ *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+ *) at_optarg= ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -728,6 +693,19 @@ do
at_clean=:
;;
+ --color )
+ at_color=always
+ ;;
+ --color=* )
+ case $at_optarg in
+ no | never | none) at_color=never ;;
+ auto | tty | if-tty) at_color=auto ;;
+ always | yes | force) at_color=always ;;
+ *) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
+ as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
+ esac
+ ;;
+
--debug | -d )
at_debug_p=:
;;
@@ -742,29 +720,31 @@ do
;;
--trace | -x )
- at_traceon='set -x'; at_traceoff='set +x'
+ at_traceon='set -x'
+ at_trace_echo=echo
+ at_check_filter_trace=at_fn_filter_trace
;;
[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
- at_func_validate_ranges at_option
- at_groups="$at_groups$at_option "
+ at_fn_validate_ranges at_option
+ as_fn_append at_groups "$at_option$as_nl"
;;
# Ranges
[0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
at_range_start=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_start
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.* \('$at_range_start' \)/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,$p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
-[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
at_range_end=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '1,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
[0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -780,11 +760,10 @@ do
at_range_end=$at_range_start
at_range_start=$at_tmp
fi
- at_func_validate_ranges at_range_start at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.*\( '$at_range_start' \)/\1/' \
- -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
# Directory selection.
@@ -794,6 +773,25 @@ do
--directory=* )
at_change_dir=:
at_dir=$at_optarg
+ if test x- = "x$at_dir" ; then
+ at_dir=./-
+ fi
+ ;;
+
+ # Parallel execution.
+ --jobs | -j )
+ at_jobs=0
+ ;;
+ --jobs=* | -j[0-9]* )
+ if test -n "$at_optarg"; then
+ at_jobs=$at_optarg
+ else
+ at_jobs=`expr X$at_option : 'X-j\(.*\)'`
+ fi
+ case $at_jobs in *[!0-9]*)
+ at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
+ as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
+ esac
;;
# Keywords.
@@ -820,11 +818,12 @@ do
at_groups_selected=`$as_echo "$at_groups_selected" |
grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
done
- # Smash the newlines.
- at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
- tr "$as_nl" ' '
- `
- at_groups="$at_groups$at_groups_selected "
+ # Smash the keywords.
+ at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
+ as_fn_append at_groups "$at_groups_selected$as_nl"
+ ;;
+ --recheck)
+ at_recheck=:
;;
--baselines )
at_prev=--baselines
@@ -842,14 +841,12 @@ do
# Reject names that are not valid shell variable names.
case $at_envvar in
'' | [0-9]* | *[!_$as_cr_alnum]* )
- { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
-$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
esac
at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
# Export now, but save eval for later and for debug scripts.
export $at_envvar
- at_debug_args="$at_debug_args $at_envvar='$at_value'"
+ as_fn_append at_debug_args " $at_envvar='$at_value'"
;;
*) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -860,32 +857,54 @@ $as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
done
# Verify our last option didn't require an argument
-if test -n "$at_prev"; then
- { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
-$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
- { (exit 1); exit 1; }; }
+if test -n "$at_prev"; then :
+ as_fn_error $? "\`$at_prev' requires an argument"
fi
+# The file containing the suite.
+at_suite_log=$at_dir/$as_me.log
# Selected test groups.
-if test -z "$at_groups"; then
+if test -z "$at_groups$at_recheck"; then
at_groups=$at_groups_all
else
+ if test -n "$at_recheck" && test -r "$at_suite_log"; then
+ at_oldfails=`sed -n '
+ /^Failed tests:$/,/^Skipped tests:$/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^Unexpected passes:$/,/^## Detailed failed tests/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^## Detailed failed tests/q
+ ' "$at_suite_log"`
+ as_fn_append at_groups "$at_oldfails$as_nl"
+ fi
# Sort the tests, removing duplicates.
- at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
+ at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
+fi
+
+if test x"$at_color" = xalways \
+ || { test x"$at_color" = xauto && test -t 1; }; then
+ at_red=`printf '\033[0;31m'`
+ at_grn=`printf '\033[0;32m'`
+ at_lgn=`printf '\033[1;32m'`
+ at_blu=`printf '\033[1;34m'`
+ at_std=`printf '\033[m'`
+else
+ at_red= at_grn= at_lgn= at_blu= at_std=
fi
##
## Process package specific options when _not_ supplied.
##
-if $at_arg_given_baselines; then
- :
+if $at_arg_given_baselines; then :
+
else
baselines=
fi
-
# Help message.
if $at_help_p; then
cat <<_ATEOF || at_write_fail=1
@@ -894,16 +913,17 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
Run all the tests, or the selected TESTS, given by numeric ranges, and
save a detailed log file. Upon failure, create debugging scripts.
-You should not change environment variables unless explicitly passed
-as command line arguments. Set \`AUTOTEST_PATH' to select the executables
+Do not change environment variables directly. Instead, set them via
+command line arguments. Set \`AUTOTEST_PATH' to select the executables
to exercise. Each relative directory is expanded as build and source
-directories relatively to the top level of this distribution. E.g.,
+directories relative to the top level of this distribution.
+E.g., from within the build directory /tmp/foo-1.0, invoking this:
$ $0 AUTOTEST_PATH=bin
-possibly amounts into
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
- PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
+ PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
_ATEOF
cat <<_ATEOF || at_write_fail=1
@@ -918,9 +938,14 @@ cat <<_ATEOF || at_write_fail=1
Execution tuning:
-C, --directory=DIR
change to directory DIR before starting
+ --color[=never|auto|always]
+ enable colored test results on terminal, or always
+ -j, --jobs[=N]
+ Allow N jobs at once; infinite jobs with no arg (default 1)
-k, --keywords=KEYWORDS
select the tests matching all the comma-separated KEYWORDS
multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
+ --recheck select all tests that failed or passed unexpectedly last time
-e, --errexit abort as soon as a test fails; implies --debug
-v, --verbose force more detailed output
default for debugging scripts
@@ -946,64 +971,69 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-libdap 3.18.3 test suite: dds-test test groups:
+libdap 3.19.0 test suite: dds-test test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
_ATEOF
- # Passing at_groups is tricky. We cannot use it to form a literal string
- # or regexp because of the limitation of AIX awk. And Solaris' awk
- # doesn't grok more than 99 fields in a record, so we have to use `split'.
- # at_groups needs to be space-separated for this script to work.
- case $at_groups in
- *"$as_nl"* )
- at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
- esac
- $as_echo "$at_groups$as_nl$at_help_all" |
- awk 'BEGIN { FS = ";" }
- NR == 1 {
- for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
+ # Pass an empty line as separator between selected groups and help.
+ $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
+ awk 'NF == 1 && FS != ";" {
+ selected[$ 1] = 1
next
}
- {
+ /^$/ { FS = ";" }
+ NF > 0 {
if (selected[$ 1]) {
printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
- if ($ 4) printf " %s\n", $ 4
+ if ($ 4) {
+ lmax = 79
+ indent = " "
+ line = indent
+ len = length (line)
+ n = split ($ 4, a, " ")
+ for (i = 1; i <= n; i++) {
+ l = length (a[i]) + 1
+ if (i > 1 && len + l > lmax) {
+ print line
+ line = indent " " a[i]
+ len = length (line)
+ } else {
+ line = line " " a[i]
+ len += l
+ }
+ }
+ if (n)
+ print line
+ }
}
}' || at_write_fail=1
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (libdap 3.18.3)" &&
- cat <<\_ACEOF || at_write_fail=1
+ $as_echo "$as_me (libdap 3.19.0)" &&
+ cat <<\_ATEOF || at_write_fail=1
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This test suite is free software; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
-_ACEOF
+_ATEOF
exit $at_write_fail
fi
-# Should we print banners? at_groups is space-separated for entire test,
-# newline-separated if only a subset of the testsuite is run.
-case $at_groups in
- *' '*' '* | *"$as_nl"*"$as_nl"* )
- at_print_banners=: ;;
+# Should we print banners? Yes if more than one test is run.
+case $at_groups in #(
+ *$as_nl* )
+ at_print_banners=: ;; #(
* ) at_print_banners=false ;;
esac
-# Text for banner N, set to empty once printed.
+# Text for banner N, set to a single space once printed.
# Take any -C into account.
if $at_change_dir ; then
- if test x- = "x$at_dir" ; then
- at_dir=./-
- fi
test x != "x$at_dir" && cd "$at_dir" \
- || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
-$as_echo "$as_me: error: unable to change directory" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error $? "unable to change directory"
at_dir=`pwd`
fi
@@ -1011,13 +1041,11 @@ fi
for at_file in atconfig atlocal
do
test -r $at_file || continue
- . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
-$as_echo "$as_me: error: invalid content: $at_file" >&2;}
- { (exit 1); exit 1; }; }
+ . ./$at_file || as_fn_error $? "invalid content: $at_file"
done
# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: ${at_top_build_prefix=$at_top_builddir}
+: "${at_top_build_prefix=$at_top_builddir}"
# Perform any assignments requested during argument parsing.
eval "$at_debug_args"
@@ -1028,8 +1056,7 @@ if test -n "$at_top_srcdir"; then
builddir=../..
for at_dir_var in srcdir top_srcdir top_build_prefix
do
- at_val=`eval 'as_val=${'at_$at_dir_var'}
- $as_echo "$as_val"'`
+ eval at_val=\$at_$at_dir_var
case $at_val in
[\\/$]* | ?:[\\/]* ) at_prefix= ;;
*) at_prefix=../../ ;;
@@ -1038,9 +1065,9 @@ if test -n "$at_top_srcdir"; then
done
fi
-## ------------------- ##
-## Directory structure ##
-## ------------------- ##
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
# This is the set of directories and files used by this script
# (non-literals are capitalized):
@@ -1071,12 +1098,14 @@ fi
# The directory the whole suite works in.
# Should be absolute to let the user `cd' at will.
at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite.
+# The file containing the suite ($at_dir might have changed since earlier).
at_suite_log=$at_dir/$as_me.log
# The directory containing helper files per test group.
at_helper_dir=$at_suite_dir/at-groups
# Stop file: if it exists, do not start new jobs.
at_stop_file=$at_suite_dir/at-stop
+# The fifo used for the job dispatcher.
+at_job_fifo=$at_suite_dir/at-job-fifo
if $at_clean; then
test -d "$at_suite_dir" &&
@@ -1100,23 +1129,23 @@ for as_dir in $AUTOTEST_PATH $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
+ test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
case $as_dir in
[\\/]* | ?:[\\/]* )
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
;;
* )
if test -z "$at_top_build_prefix"; then
# Stand-alone test suite.
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
else
# Embedded test suite.
- at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
- at_path=$at_path$at_top_srcdir/$as_dir
+ as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
+ as_fn_append at_path "$at_top_srcdir/$as_dir"
fi
;;
esac
-done
+ done
IFS=$as_save_IFS
@@ -1130,7 +1159,7 @@ for as_dir in $at_path
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -d "$as_dir" || continue
+ test -d "$as_dir" || continue
case $as_dir in
[\\/]* | ?:[\\/]* ) ;;
* ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1138,15 +1167,18 @@ esac
case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
*$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
$PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
- *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
+ *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
esac
-done
+ done
IFS=$as_save_IFS
PATH=$at_new_path
export PATH
# Setting up the FDs.
+
+
+
# 5 is the log file. Not to be overwritten if `-d'.
if $at_debug_p; then
at_suite_log=/dev/null
@@ -1156,43 +1188,28 @@ fi
exec 5>>"$at_suite_log"
# Banners and logs.
-cat <<\_ASBOX
-## ----------------------------------- ##
-## libdap 3.18.3 test suite: dds-test. ##
-## ----------------------------------- ##
-_ASBOX
+$as_echo "## ----------------------------------- ##
+## libdap 3.19.0 test suite: dds-test. ##
+## ----------------------------------- ##"
{
- cat <<\_ASBOX
-## ----------------------------------- ##
-## libdap 3.18.3 test suite: dds-test. ##
-## ----------------------------------- ##
-_ASBOX
+ $as_echo "## ----------------------------------- ##
+## libdap 3.19.0 test suite: dds-test. ##
+## ----------------------------------- ##"
echo
$as_echo "$as_me: command line was:"
$as_echo " \$ $0 $at_cli_args"
echo
- # Try to find a few ChangeLogs in case it might help determining the
- # exact version. Use the relative dir: if the top dir is a symlink,
- # find will not follow it (and options to follow the links are not
- # portable), which would result in no output here. Prune directories
- # matching the package tarname, since they tend to be leftovers from
- # `make dist' or `make distcheck' and contain redundant or stale logs.
- if test -n "$at_top_srcdir"; then
- cat <<\_ASBOX
-## ----------- ##
-## ChangeLogs. ##
-## ----------- ##
-_ASBOX
+ # If ChangeLog exists, list a few lines in case it might help determining
+ # the exact version.
+ if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
+ $as_echo "## ---------- ##
+## ChangeLog. ##
+## ---------- ##"
+ echo
+ sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
echo
- for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
- do
- $as_echo "$as_me: $at_file:"
- sed 's/^/| /;10q' $at_file
- echo
- done
-
fi
{
@@ -1225,8 +1242,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
}
@@ -1243,53 +1260,80 @@ IFS=$as_save_IFS
} >&5
-## --------------- ##
-## Shell functions ##
-## --------------- ##
+## ------------------------- ##
+## Autotest shell functions. ##
+## ------------------------- ##
-# at_func_banner NUMBER
-# ---------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups
-# and this particular banner has not yet been printed.
-at_func_banner ()
+# at_fn_banner NUMBER
+# -------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups and
+# this particular banner has not yet been printed.
+at_fn_banner ()
{
$at_print_banners || return 0
eval at_banner_text=\$at_banner_text_$1
- test "x$at_banner_text" = x && return 0
- eval at_banner_text_$1=
- $as_echo "$as_nl$at_banner_text$as_nl"
-} # at_func_banner
+ test "x$at_banner_text" = "x " && return 0
+ eval "at_banner_text_$1=\" \""
+ if test -z "$at_banner_text"; then
+ $at_first || echo
+ else
+ $as_echo "$as_nl$at_banner_text$as_nl"
+ fi
+} # at_fn_banner
-# at_func_check_newline COMMAND
-# -----------------------------
-# Test if COMMAND includes a newline and, if so, print a message and return
-# exit code 1
-at_func_check_newline ()
+# at_fn_check_prepare_notrace REASON LINE
+# ---------------------------------------
+# Perform AT_CHECK preparations for the command at LINE for an untraceable
+# command; REASON is the reason for disabling tracing.
+at_fn_check_prepare_notrace ()
{
- case "$1" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
- return 1 ;;
- *) return 0 ;;
- esac
+ $at_trace_echo "Not enabling shell tracing (command contains $1)"
+ $as_echo "$2" >"$at_check_line_file"
+ at_check_trace=: at_check_filter=:
+ : >"$at_stdout"; : >"$at_stderr"
}
-# at_func_filter_trace EXIT-CODE
+# at_fn_check_prepare_trace LINE
# ------------------------------
-# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
-# and the other lines (on file "$at_stderr"). Return the exit code EXIT-CODE.
-at_func_filter_trace ()
+# Perform AT_CHECK preparations for the command at LINE for a traceable
+# command.
+at_fn_check_prepare_trace ()
+{
+ $as_echo "$1" >"$at_check_line_file"
+ at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
+ : >"$at_stdout"; : >"$at_stderr"
+}
+
+# at_fn_check_prepare_dynamic COMMAND LINE
+# ----------------------------------------
+# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
+# preparation function.
+at_fn_check_prepare_dynamic ()
+{
+ case $1 in
+ *$as_nl*)
+ at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+ *)
+ at_fn_check_prepare_trace "$2" ;;
+ esac
+}
+
+# at_fn_filter_trace
+# ------------------
+# Remove the lines in the file "$at_stderr" generated by "set -x" and print
+# them to stderr.
+at_fn_filter_trace ()
{
+ mv "$at_stderr" "$at_stder1"
grep '^ *+' "$at_stder1" >&2
grep -v '^ *+' "$at_stder1" >"$at_stderr"
- return $1
}
-# at_func_log_failure FILE-LIST
-# -----------------------------
+# at_fn_log_failure FILE-LIST
+# ---------------------------
# Copy the files in the list on stdout with a "> " prefix, and exit the shell
# with a failure exit code.
-at_func_log_failure ()
+at_fn_log_failure ()
{
for file
do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1297,56 +1341,62 @@ at_func_log_failure ()
exit 1
}
-# at_func_check_skip EXIT-CODE
-# ----------------------------
-# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
-# with that same exit code.
-at_func_check_skip ()
+# at_fn_check_skip EXIT-CODE LINE
+# -------------------------------
+# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
+# the test group subshell with that same exit code. Use LINE in any report
+# about test failure.
+at_fn_check_skip ()
{
case $1 in
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$2: hard failure"; exit 99;;
77) echo 77 > "$at_status_file"; exit 77;;
esac
}
-# at_func_check_status EXPECTED EXIT-CODE LINE
-# --------------------------------------------
-# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
-# Otherwise, if it is 77 exit the shell with that same exit code; if it is
-# anything else print an error message and fail the test.
-at_func_check_status ()
+# at_fn_check_status EXPECTED EXIT-CODE LINE
+# ------------------------------------------
+# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
+# Otherwise, if it is 77 or 99, exit the test group subshell with that same
+# exit code; if it is anything else print an error message referring to LINE,
+# and fail the test.
+at_fn_check_status ()
{
case $2 in
$1 ) ;;
77) echo 77 > "$at_status_file"; exit 77;;
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$3: hard failure"; exit 99;;
*) $as_echo "$3: exit code was $2, expected $1"
at_failed=:;;
esac
}
-# at_func_diff_devnull FILE
-# -------------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless
-# diff invocations.
-at_func_diff_devnull ()
+# at_fn_diff_devnull FILE
+# -----------------------
+# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
+# invocations.
+at_fn_diff_devnull ()
{
test -s "$1" || return 0
$at_diff "$at_devnull" "$1"
}
-# at_func_test NUMBER
-# -------------------
+# at_fn_test NUMBER
+# -----------------
# Parse out test NUMBER from the tail of this file.
-at_func_test ()
+at_fn_test ()
{
eval at_sed=\$at_sed$1
sed "$at_sed" "$at_myself" > "$at_test_source"
}
-# at_func_create_debugging_script
-# -------------------------------
+# at_fn_create_debugging_script
+# -----------------------------
# Create the debugging script $at_group_dir/run which will reproduce the
# current test group.
-at_func_create_debugging_script ()
+at_fn_create_debugging_script ()
{
{
echo "#! /bin/sh" &&
@@ -1358,34 +1408,13 @@ at_func_create_debugging_script ()
chmod +x "$at_group_dir/run"
}
-# at_func_arith
-# -------------
-# Arithmetic evaluation, avoids expr if the shell is sane. The
-# interpretation of leading zeroes is unspecified.
-#
-# subshell and eval are needed to keep Solaris sh from bailing out:
-if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
- # With "$@", bash does not split positional parameters:
- eval 'at_func_arith ()
- {
- at_func_arith_result=$(( $* ))
- }'
-else
- at_func_arith ()
- {
- at_func_arith_result=`expr "$@"`
- }
-fi
-
-## ---------------------- ##
-## End of shell functions ##
-## ---------------------- ##
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
{
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Tested programs. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
} >&5
@@ -1393,34 +1422,35 @@ _ASBOX
for at_program in : $at_tested
do
test "$at_program" = : && continue
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $at_program in
+ [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
+ * )
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -f "$as_dir/$at_program" && break
-done
+ test -f "$as_dir/$at_program" && break
+ done
IFS=$as_save_IFS
- if test -f "$as_dir/$at_program"; then
+ at_program_=$as_dir/$at_program ;;
+ esac
+ if test -f "$at_program_"; then
{
- $as_echo "$at_srcdir/DDSTest.at:3: $as_dir/$at_program --version"
- "$as_dir/$at_program" --version </dev/null
+ $as_echo "$at_srcdir/DDSTest.at:3: $at_program_ --version"
+ "$at_program_" --version </dev/null
echo
} >&5 2>&1
else
- { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
-$as_echo "$as_me: error: cannot find $at_program" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find $at_program" "$LINENO" 5
fi
done
{
- cat <<\_ASBOX
-## ------------------ ##
+ $as_echo "## ------------------ ##
## Running the tests. ##
-## ------------------ ##
-_ASBOX
+## ------------------ ##"
} >&5
at_start_date=`date`
@@ -1428,11 +1458,8 @@ at_start_time=`date +%s 2>/dev/null`
$as_echo "$as_me: starting at: $at_start_date" >&5
# Create the master directory if it doesn't already exist.
-test -d "$at_suite_dir" ||
- mkdir "$at_suite_dir" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
-$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
- { (exit 1); exit 1; }; }
+as_dir="$at_suite_dir"; as_fn_mkdir_p ||
+ as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
# Can we diff with `/dev/null'? DU 5.0 refuses.
if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1466,28 +1493,40 @@ BEGIN { FS="" }
if (test == "'"$at_group"'") exit
}' "$at_myself" > "$at_suite_dir/at-source-lines" &&
. "$at_suite_dir/at-source-lines" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
-$as_echo "$as_me: error: cannot create test line number cache" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot create test line number cache" "$LINENO" 5
rm -f "$at_suite_dir/at-source-lines"
+# Set number of jobs for `-j'; avoid more jobs than test groups.
+set X $at_groups; shift; at_max_jobs=$#
+if test $at_max_jobs -eq 0; then
+ at_jobs=1
+fi
+if test $at_jobs -ne 1 &&
+ { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
+ at_jobs=$at_max_jobs
+fi
+
+# If parallel mode, don't output banners, don't split summary lines.
+if test $at_jobs -ne 1; then
+ at_print_banners=false
+ at_quiet=:
+fi
+
# Set up helper dirs.
rm -rf "$at_helper_dir" &&
mkdir "$at_helper_dir" &&
cd "$at_helper_dir" &&
{ test -z "$at_groups" || mkdir $at_groups; } ||
-{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
-$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
- { (exit 1); exit 1; }; }
+as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
# Functions for running a test group. We leave the actual
# test group execution outside of a shell function in order
# to avoid hitting zsh 4.x exit status bugs.
-# at_func_group_prepare
-# ---------------------
-# Prepare running a test group
-at_func_group_prepare ()
+# at_fn_group_prepare
+# -------------------
+# Prepare for running a test group.
+at_fn_group_prepare ()
{
# The directory for additional per-group helper files.
at_job_dir=$at_helper_dir/$at_group
@@ -1521,56 +1560,20 @@ at_func_group_prepare ()
# Create a fresh directory for the next test group, and enter.
+ # If one already exists, the user may have invoked ./run from
+ # within that directory; we remove the contents, but not the
+ # directory itself, so that we aren't pulling the rug out from
+ # under the shell's notion of the current directory.
at_group_dir=$at_suite_dir/$at_group_normalized
at_group_log=$at_group_dir/$as_me.log
if test -d "$at_group_dir"; then
- find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
- rm -fr "$at_group_dir" ||
- { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
- fi
+ find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
+ rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
+fi ||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
# Be tolerant if the above `rm' was not able to remove the directory.
- { as_dir="$at_group_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$at_group_dir"; as_fn_mkdir_p
echo 0 > "$at_status_file"
@@ -1583,9 +1586,29 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
fi
}
-# at_func_group_postprocess
-# -------------------------
-at_func_group_postprocess ()
+# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
+# -------------------------------------------------
+# Declare the test group ORDINAL, located at LINE with group description DESC,
+# and residing under BANNER. Use PAD to align the status column.
+at_fn_group_banner ()
+{
+ at_setup_line="$2"
+ test -n "$5" && at_fn_banner $5
+ at_desc="$3"
+ case $1 in
+ [0-9]) at_desc_line=" $1: ";;
+ [0-9][0-9]) at_desc_line=" $1: " ;;
+ *) at_desc_line="$1: " ;;
+ esac
+ as_fn_append at_desc_line "$3$4"
+ $at_quiet $as_echo_n "$at_desc_line"
+ echo "# -*- compilation -*-" >> "$at_group_log"
+}
+
+# at_fn_group_postprocess
+# -----------------------
+# Perform cleanup after running a test group.
+at_fn_group_postprocess ()
{
# Be sure to come back to the suite directory, in particular
# since below we might `rm' the group directory we are in currently.
@@ -1598,6 +1621,7 @@ at_func_group_postprocess ()
report this failure to <opendap-tech at opendap.org>.
_ATEOF
$as_echo "$at_setup_line" >"$at_check_line_file"
+ at_status=99
fi
$at_verbose $as_echo_n "$at_group. $at_setup_line: "
$as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1606,31 +1630,41 @@ _ATEOF
at_msg="UNEXPECTED PASS"
at_res=xpass
at_errexit=$at_errexit_p
+ at_color=$at_red
;;
no:0)
at_msg="ok"
at_res=pass
at_errexit=false
+ at_color=$at_grn
;;
*:77)
at_msg='skipped ('`cat "$at_check_line_file"`')'
at_res=skip
at_errexit=false
+ at_color=$at_blu
+ ;;
+ no:* | *:99)
+ at_msg='FAILED ('`cat "$at_check_line_file"`')'
+ at_res=fail
+ at_errexit=$at_errexit_p
+ at_color=$at_red
;;
yes:*)
at_msg='expected failure ('`cat "$at_check_line_file"`')'
at_res=xfail
at_errexit=false
- ;;
- no:*)
- at_msg='FAILED ('`cat "$at_check_line_file"`')'
- at_res=fail
- at_errexit=$at_errexit_p
+ at_color=$at_lgn
;;
esac
echo "$at_res" > "$at_job_dir/$at_res"
- # Make sure there is a separator even with long titles.
- $as_echo " $at_msg"
+ # In parallel mode, output the summary line only afterwards.
+ if test $at_jobs -ne 1 && test -n "$at_verbose"; then
+ $as_echo "$at_desc_line $at_color$at_msg$at_std"
+ else
+ # Make sure there is a separator even with long titles.
+ $as_echo " $at_color$at_msg$at_std"
+ fi
at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
case $at_status in
0|77)
@@ -1645,9 +1679,13 @@ _ATEOF
$as_echo "$at_log_msg" >> "$at_group_log"
$as_echo "$at_log_msg" >&5
- # Cleanup the group directory, unless the user wants the files.
- if $at_debug_p; then
- at_func_create_debugging_script
+ # Cleanup the group directory, unless the user wants the files
+ # or the success was unexpected.
+ if $at_debug_p || test $at_res = xpass; then
+ at_fn_create_debugging_script
+ if test $at_res = xpass && $at_errexit; then
+ echo stop > "$at_stop_file"
+ fi
else
if test -d "$at_group_dir"; then
find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1664,7 +1702,7 @@ _ATEOF
# Upon failure, keep the group directory for autopsy, and create
# the debugging script. With -e, do not start any further tests.
- at_func_create_debugging_script
+ at_fn_create_debugging_script
if $at_errexit; then
echo stop > "$at_stop_file"
fi
@@ -1677,22 +1715,134 @@ _ATEOF
## Driver loop. ##
## ------------ ##
+
+if (set -m && set +m && set +b) >/dev/null 2>&1; then
+ set +b
+ at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
+else
+ at_job_control_on=: at_job_control_off=: at_job_group=
+fi
+
+for at_signal in 1 2 15; do
+ trap 'set +x; set +e
+ $at_job_control_off
+ at_signal='"$at_signal"'
+ echo stop > "$at_stop_file"
+ trap "" $at_signal
+ at_pgids=
+ for at_pgid in `jobs -p 2>/dev/null`; do
+ at_pgids="$at_pgids $at_job_group$at_pgid"
+ done
+ test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
+ wait
+ if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
+ echo >&2
+ fi
+ at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
+ set x $at_signame
+ test 1 -gt 2 && at_signame=$at_signal
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
+$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
+ as_fn_arith 128 + $at_signal && exit_status=$as_val
+ as_fn_exit $exit_status' $at_signal
+done
+
rm -f "$at_stop_file"
at_first=:
-for at_group in $at_groups; do
- at_func_group_prepare
- if cd "$at_group_dir" &&
- at_func_test $at_group &&
- . "$at_test_source"; then :; else
- { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
+if test $at_jobs -ne 1 &&
+ rm -f "$at_job_fifo" &&
+ test -n "$at_job_group" &&
+ ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
+then
+ # FIFO job dispatcher.
+
+ trap 'at_pids=
+ for at_pid in `jobs -p`; do
+ at_pids="$at_pids $at_job_group$at_pid"
+ done
+ if test -n "$at_pids"; then
+ at_sig=TSTP
+ test "${TMOUT+set}" = set && at_sig=STOP
+ kill -$at_sig $at_pids 2>/dev/null
+ fi
+ kill -STOP $$
+ test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
+
+ echo
+ # Turn jobs into a list of numbers, starting from 1.
+ at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
+
+ set X $at_joblist
+ shift
+ for at_group in $at_groups; do
+ $at_job_control_on 2>/dev/null
+ (
+ # Start one test group.
+ $at_job_control_off
+ if $at_first; then
+ exec 7>"$at_job_fifo"
+ else
+ exec 6<&-
+ fi
+ trap 'set +x; set +e
+ trap "" PIPE
+ echo stop > "$at_stop_file"
+ echo >&7
+ as_fn_exit 141' PIPE
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"
+ then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
- at_failed=:
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ echo >&7
+ ) &
+ $at_job_control_off
+ if $at_first; then
+ at_first=false
+ exec 6<"$at_job_fifo" 7>"$at_job_fifo"
+ fi
+ shift # Consume one token.
+ if test $# -gt 0; then :; else
+ read at_token <&6 || break
+ set x $*
+ fi
+ test -f "$at_stop_file" && break
+ done
+ exec 7>&-
+ # Read back the remaining ($at_jobs - 1) tokens.
+ set X $at_joblist
+ shift
+ if test $# -gt 0; then
+ shift
+ for at_job
+ do
+ read at_token
+ done <&6
fi
- at_func_group_postprocess
- test -f "$at_stop_file" && break
- at_first=false
-done
+ exec 6<&-
+ wait
+else
+ # Run serially, avoid forks and other potential surprises.
+ for at_group in $at_groups; do
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"; then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ test -f "$at_stop_file" && break
+ at_first=false
+ done
+fi
# Wrap up the test suite with summary statistics.
cd "$at_helper_dir"
@@ -1713,12 +1863,9 @@ set X $at_xfail_list; shift; at_xfail_count=$#
set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
set X $at_skip_list; shift; at_skip_count=$#
-at_func_arith $at_group_count - $at_skip_count
-at_run_count=$at_func_arith_result
-at_func_arith $at_xpass_count + $at_fail_count
-at_unexpected_count=$at_func_arith_result
-at_func_arith $at_xfail_count + $at_fail_count
-at_total_fail_count=$at_func_arith_result
+as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
+as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
+as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
# Back to the top directory.
cd "$at_dir"
@@ -1730,35 +1877,26 @@ at_stop_time=`date +%s 2>/dev/null`
$as_echo "$as_me: ending at: $at_stop_date" >&5
case $at_start_time,$at_stop_time in
[0-9]*,[0-9]*)
- at_func_arith $at_stop_time - $at_start_time
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_s / 60
- at_duration_m=$at_func_arith_result
- at_func_arith $at_duration_m / 60
- at_duration_h=$at_func_arith_result
- at_func_arith $at_duration_s % 60
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_m % 60
- at_duration_m=$at_func_arith_result
+ as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
+ as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
+ as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
+ as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
+ as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
$as_echo "$as_me: test suite duration: $at_duration" >&5
;;
esac
echo
-cat <<\_ASBOX
-## ------------- ##
+$as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
{
echo
- cat <<\_ASBOX
-## ------------- ##
+ $as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
} >&5
@@ -1776,12 +1914,14 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
at_result="$at_result $at_were run, one failed"
fi
at_result="$at_result unexpectedly and inhibited subsequent tests."
+ at_color=$at_red
else
# Don't you just love exponential explosion of the number of cases?
+ at_color=$at_red
case $at_xpass_count:$at_fail_count:$at_xfail_count in
# So far, so good.
- 0:0:0) at_result="$at_result $at_were successful." ;;
- 0:0:*) at_result="$at_result behaved as expected." ;;
+ 0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
+ 0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
# Some unexpected failures
0:*:0) at_result="$at_result $at_were run,
@@ -1827,18 +1967,16 @@ $at_skip_count tests were skipped." ;;
esac
if test $at_unexpected_count = 0; then
- echo "$at_result"
+ echo "$at_color$at_result$at_std"
echo "$at_result" >&5
else
- echo "ERROR: $at_result" >&2
+ echo "${at_color}ERROR: $at_result$at_std" >&2
echo "ERROR: $at_result" >&5
{
echo
- cat <<\_ASBOX
-## ------------------------ ##
+ $as_echo "## ------------------------ ##
## Summary of the failures. ##
-## ------------------------ ##
-_ASBOX
+## ------------------------ ##"
# Summary of failed and skipped tests.
if test $at_fail_count != 0; then
@@ -1857,11 +1995,9 @@ _ASBOX
echo
fi
if test $at_fail_count != 0; then
- cat <<\_ASBOX
-## ---------------------- ##
+ $as_echo "## ---------------------- ##
## Detailed failed tests. ##
-## ---------------------- ##
-_ASBOX
+## ---------------------- ##"
echo
for at_group in $at_fail_list
do
@@ -1893,19 +2029,21 @@ _ASBOX
_ASBOX
echo
- $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
+ if $at_debug_p; then
+ at_msg='per-test log files'
+ else
+ at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
+ fi
+ $as_echo "Please send $at_msg and all information you think might help:
To: <opendap-tech at opendap.org>
- Subject: [libdap 3.18.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [libdap 3.19.0] $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
+be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
"
- if test $at_debug_p = false; then
- echo
- echo 'You may investigate any problem if you feel able to do so, in which'
- echo 'case the test suite provides a good starting point. Its output may'
- $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
- echo
- fi
- exit 1
+ exit 1
fi
exit 0
@@ -1914,15 +2052,12 @@ exit 0
## Actual tests. ##
## ------------- ##
#AT_START_1
-# 1. DDSTest.at:48: DDS $abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds
-at_setup_line='DDSTest.at:48'
-at_desc="DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds"
-$at_quiet $as_echo_n " 1: $at_desc"
+at_fn_group_banner 1 'DDSTest.at:48' \
+ "DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds" ""
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "1. DDSTest.at:48: testing ..."
+ $as_echo "1. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -1930,114 +2065,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds
baseline=$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:48: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:48 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:48"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:48: mv stdout \$baseline.tmp"
-echo DDSTest.at:48 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:48"
+( $at_check_trace; mv stdout $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/DDSTest.at:48"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:48: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:48 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:48"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:48: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:48 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:48"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_1
#AT_START_2
-# 2. DDSTest.at:49: DDS $abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds
-at_setup_line='DDSTest.at:49'
-at_desc="DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds"
-$at_quiet $as_echo_n " 2: $at_desc"
+at_fn_group_banner 2 'DDSTest.at:49' \
+ "DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds" ""
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "2. DDSTest.at:49: testing ..."
+ $as_echo "2. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2045,114 +2148,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds
baseline=$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:49: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:49 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:49"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:49: mv stdout \$baseline.tmp"
-echo DDSTest.at:49 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:49"
+( $at_check_trace; mv stdout $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/DDSTest.at:49"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:49: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:49 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:49"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:49: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:49 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:49"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_2
#AT_START_3
-# 3. DDSTest.at:50: DDS $abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds
-at_setup_line='DDSTest.at:50'
-at_desc="DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds"
-$at_quiet $as_echo_n " 3: $at_desc"
+at_fn_group_banner 3 'DDSTest.at:50' \
+ "DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds" ""
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "3. DDSTest.at:50: testing ..."
+ $as_echo "3. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2160,114 +2231,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds
baseline=$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:50: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:50 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:50"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:50: mv stdout \$baseline.tmp"
-echo DDSTest.at:50 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:50"
+( $at_check_trace; mv stdout $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/DDSTest.at:50"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:50: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:50 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:50"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:50: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:50 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:50"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_3
#AT_START_4
-# 4. DDSTest.at:51: DDS $abs_srcdir/dds-testsuite/AsciiOutputTest1.dds
-at_setup_line='DDSTest.at:51'
-at_desc="DDS \$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds"
-$at_quiet $as_echo_n " 4: $at_desc"
+at_fn_group_banner 4 'DDSTest.at:51' \
+ "DDS \$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds" ""
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "4. DDSTest.at:51: testing ..."
+ $as_echo "4. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2275,114 +2314,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds
baseline=$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:51: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:51 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:51"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:51: mv stdout \$baseline.tmp"
-echo DDSTest.at:51 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:51"
+( $at_check_trace; mv stdout $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/DDSTest.at:51"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:51: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:51 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:51"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:51: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:51 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:51"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_4
#AT_START_5
-# 5. DDSTest.at:52: DDS $abs_srcdir/dds-testsuite/fnoc1.nc.das.dds
-at_setup_line='DDSTest.at:52'
-at_desc="DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds"
-$at_quiet $as_echo_n " 5: $at_desc "
+at_fn_group_banner 5 'DDSTest.at:52' \
+ "DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "5. DDSTest.at:52: testing ..."
+ $as_echo "5. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2390,114 +2397,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds
baseline=$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:52: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:52 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:52"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:52: mv stdout \$baseline.tmp"
-echo DDSTest.at:52 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:52"
+( $at_check_trace; mv stdout $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/DDSTest.at:52"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:52: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:52 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:52"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:52: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:52 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:52"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_5
#AT_START_6
-# 6. DDSTest.at:53: DDS $abs_srcdir/dds-testsuite/fnoc1.nc.dds
-at_setup_line='DDSTest.at:53'
-at_desc="DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.dds"
-$at_quiet $as_echo_n " 6: $at_desc "
+at_fn_group_banner 6 'DDSTest.at:53' \
+ "DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "6. DDSTest.at:53: testing ..."
+ $as_echo "6. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2505,114 +2480,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/fnoc1.nc.dds
baseline=$abs_srcdir/dds-testsuite/fnoc1.nc.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:53: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:53 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:53"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:53: mv stdout \$baseline.tmp"
-echo DDSTest.at:53 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:53"
+( $at_check_trace; mv stdout $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/DDSTest.at:53"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:53: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:53 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:53"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:53: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:53 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:53"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_6
#AT_START_7
-# 7. DDSTest.at:54: DDS $abs_srcdir/dds-testsuite/S2000415.HDF.das.dds
-at_setup_line='DDSTest.at:54'
-at_desc="DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds"
-$at_quiet $as_echo_n " 7: $at_desc"
+at_fn_group_banner 7 'DDSTest.at:54' \
+ "DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds" ""
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "7. DDSTest.at:54: testing ..."
+ $as_echo "7. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2620,114 +2563,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds
baseline=$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:54: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:54 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:54"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:54: mv stdout \$baseline.tmp"
-echo DDSTest.at:54 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:54"
+( $at_check_trace; mv stdout $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/DDSTest.at:54"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:54: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:54 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:54"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:54: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:54 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:54"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_7
#AT_START_8
-# 8. DDSTest.at:55: DDS $abs_srcdir/dds-testsuite/S2000415.HDF.dds
-at_setup_line='DDSTest.at:55'
-at_desc="DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.dds"
-$at_quiet $as_echo_n " 8: $at_desc "
+at_fn_group_banner 8 'DDSTest.at:55' \
+ "DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "8. DDSTest.at:55: testing ..."
+ $as_echo "8. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2735,114 +2646,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/S2000415.HDF.dds
baseline=$abs_srcdir/dds-testsuite/S2000415.HDF.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:55: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:55 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:55"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:55: mv stdout \$baseline.tmp"
-echo DDSTest.at:55 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:55"
+( $at_check_trace; mv stdout $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/DDSTest.at:55"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:55: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:55 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:55"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:55: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:55 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:55"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_8
#AT_START_9
-# 9. DDSTest.at:56: DDS $abs_srcdir/dds-testsuite/test.1.dds
-at_setup_line='DDSTest.at:56'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.1.dds"
-$at_quiet $as_echo_n " 9: $at_desc "
+at_fn_group_banner 9 'DDSTest.at:56' \
+ "DDS \$abs_srcdir/dds-testsuite/test.1.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "9. DDSTest.at:56: testing ..."
+ $as_echo "9. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2850,114 +2729,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.1.dds
baseline=$abs_srcdir/dds-testsuite/test.1.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:56: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:56 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:56"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:56: mv stdout \$baseline.tmp"
-echo DDSTest.at:56 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:56"
+( $at_check_trace; mv stdout $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/DDSTest.at:56"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:56: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:56 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:56"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:56: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:56 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:56"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_9
#AT_START_10
-# 10. DDSTest.at:57: DDS $abs_srcdir/dds-testsuite/test.10.dds
-at_setup_line='DDSTest.at:57'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.10.dds"
-$at_quiet $as_echo_n " 10: $at_desc "
+at_fn_group_banner 10 'DDSTest.at:57' \
+ "DDS \$abs_srcdir/dds-testsuite/test.10.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "10. DDSTest.at:57: testing ..."
+ $as_echo "10. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2965,114 +2812,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.10.dds
baseline=$abs_srcdir/dds-testsuite/test.10.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:57: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:57"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:57: mv stdout \$baseline.tmp"
-echo DDSTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:57"
+( $at_check_trace; mv stdout $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/DDSTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:57: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:57"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:57: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:57"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_10
#AT_START_11
-# 11. DDSTest.at:58: DDS $abs_srcdir/dds-testsuite/test.11.dds
-at_setup_line='DDSTest.at:58'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.11.dds"
-$at_quiet $as_echo_n " 11: $at_desc "
+at_fn_group_banner 11 'DDSTest.at:58' \
+ "DDS \$abs_srcdir/dds-testsuite/test.11.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "11. DDSTest.at:58: testing ..."
+ $as_echo "11. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3080,114 +2895,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.11.dds
baseline=$abs_srcdir/dds-testsuite/test.11.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:58: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:58"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:58: mv stdout \$baseline.tmp"
-echo DDSTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:58"
+( $at_check_trace; mv stdout $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/DDSTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:58: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:58"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:58: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:58"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_11
#AT_START_12
-# 12. DDSTest.at:59: DDS $abs_srcdir/dds-testsuite/test.12.dds
-at_setup_line='DDSTest.at:59'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.12.dds"
-$at_quiet $as_echo_n " 12: $at_desc "
+at_fn_group_banner 12 'DDSTest.at:59' \
+ "DDS \$abs_srcdir/dds-testsuite/test.12.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "12. DDSTest.at:59: testing ..."
+ $as_echo "12. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3195,114 +2978,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.12.dds
baseline=$abs_srcdir/dds-testsuite/test.12.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:59: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:59"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:59: mv stdout \$baseline.tmp"
-echo DDSTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:59"
+( $at_check_trace; mv stdout $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/DDSTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:59: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:59"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:59: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:59"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_12
#AT_START_13
-# 13. DDSTest.at:60: DDS $abs_srcdir/dds-testsuite/test.13.dds
-at_setup_line='DDSTest.at:60'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.13.dds"
-$at_quiet $as_echo_n " 13: $at_desc "
+at_fn_group_banner 13 'DDSTest.at:60' \
+ "DDS \$abs_srcdir/dds-testsuite/test.13.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "13. DDSTest.at:60: testing ..."
+ $as_echo "13. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3310,114 +3061,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.13.dds
baseline=$abs_srcdir/dds-testsuite/test.13.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:60: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:60"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:60: mv stdout \$baseline.tmp"
-echo DDSTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:60"
+( $at_check_trace; mv stdout $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/DDSTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:60: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:60"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:60: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:60"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_13
#AT_START_14
-# 14. DDSTest.at:61: DDS $abs_srcdir/dds-testsuite/test.14.dds
-at_setup_line='DDSTest.at:61'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.14.dds"
-$at_quiet $as_echo_n " 14: $at_desc "
+at_fn_group_banner 14 'DDSTest.at:61' \
+ "DDS \$abs_srcdir/dds-testsuite/test.14.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "14. DDSTest.at:61: testing ..."
+ $as_echo "14. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3425,114 +3144,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.14.dds
baseline=$abs_srcdir/dds-testsuite/test.14.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:61: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:61"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:61: mv stdout \$baseline.tmp"
-echo DDSTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:61"
+( $at_check_trace; mv stdout $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/DDSTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:61: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:61"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:61: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:61"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_14
#AT_START_15
-# 15. DDSTest.at:62: DDS $abs_srcdir/dds-testsuite/test.15.dds
-at_setup_line='DDSTest.at:62'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.15.dds"
-$at_quiet $as_echo_n " 15: $at_desc "
+at_fn_group_banner 15 'DDSTest.at:62' \
+ "DDS \$abs_srcdir/dds-testsuite/test.15.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "15. DDSTest.at:62: testing ..."
+ $as_echo "15. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3540,114 +3227,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.15.dds
baseline=$abs_srcdir/dds-testsuite/test.15.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:62: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:62"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:62: mv stdout \$baseline.tmp"
-echo DDSTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:62"
+( $at_check_trace; mv stdout $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/DDSTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:62: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:62"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:62: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:62"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_15
#AT_START_16
-# 16. DDSTest.at:63: DDS $abs_srcdir/dds-testsuite/test.16.dds
-at_setup_line='DDSTest.at:63'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.16.dds"
-$at_quiet $as_echo_n " 16: $at_desc "
+at_fn_group_banner 16 'DDSTest.at:63' \
+ "DDS \$abs_srcdir/dds-testsuite/test.16.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "16. DDSTest.at:63: testing ..."
+ $as_echo "16. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3655,114 +3310,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.16.dds
baseline=$abs_srcdir/dds-testsuite/test.16.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:63: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:63"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:63: mv stdout \$baseline.tmp"
-echo DDSTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:63"
+( $at_check_trace; mv stdout $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/DDSTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:63: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:63"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:63: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:63"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_16
#AT_START_17
-# 17. DDSTest.at:64: DDS $abs_srcdir/dds-testsuite/test.17.dds
-at_setup_line='DDSTest.at:64'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.17.dds"
-$at_quiet $as_echo_n " 17: $at_desc "
+at_fn_group_banner 17 'DDSTest.at:64' \
+ "DDS \$abs_srcdir/dds-testsuite/test.17.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "17. DDSTest.at:64: testing ..."
+ $as_echo "17. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3770,114 +3393,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.17.dds
baseline=$abs_srcdir/dds-testsuite/test.17.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:64: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:64"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:64: mv stdout \$baseline.tmp"
-echo DDSTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:64"
+( $at_check_trace; mv stdout $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/DDSTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:64: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:64"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:64: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:64"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_17
#AT_START_18
-# 18. DDSTest.at:65: DDS $abs_srcdir/dds-testsuite/test.18.dds
-at_setup_line='DDSTest.at:65'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.18.dds"
-$at_quiet $as_echo_n " 18: $at_desc "
+at_fn_group_banner 18 'DDSTest.at:65' \
+ "DDS \$abs_srcdir/dds-testsuite/test.18.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "18. DDSTest.at:65: testing ..."
+ $as_echo "18. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3885,114 +3476,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.18.dds
baseline=$abs_srcdir/dds-testsuite/test.18.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:65: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:65 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:65"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:65: mv stdout \$baseline.tmp"
-echo DDSTest.at:65 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:65"
+( $at_check_trace; mv stdout $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/DDSTest.at:65"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:65: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:65 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:65"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:65: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:65 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:65"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_18
#AT_START_19
-# 19. DDSTest.at:66: DDS $abs_srcdir/dds-testsuite/test.19.dds
-at_setup_line='DDSTest.at:66'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.19.dds"
-$at_quiet $as_echo_n " 19: $at_desc "
+at_fn_group_banner 19 'DDSTest.at:66' \
+ "DDS \$abs_srcdir/dds-testsuite/test.19.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "19. DDSTest.at:66: testing ..."
+ $as_echo "19. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4000,114 +3559,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.19.dds
baseline=$abs_srcdir/dds-testsuite/test.19.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:66: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:66"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:66: mv stdout \$baseline.tmp"
-echo DDSTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:66"
+( $at_check_trace; mv stdout $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/DDSTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:66: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:66"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:66: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:66"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_19
#AT_START_20
-# 20. DDSTest.at:67: DDS $abs_srcdir/dds-testsuite/test.19b.das.dds
-at_setup_line='DDSTest.at:67'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.19b.das.dds"
-$at_quiet $as_echo_n " 20: $at_desc "
+at_fn_group_banner 20 'DDSTest.at:67' \
+ "DDS \$abs_srcdir/dds-testsuite/test.19b.das.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "20. DDSTest.at:67: testing ..."
+ $as_echo "20. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4115,114 +3642,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.19b.das.dds
baseline=$abs_srcdir/dds-testsuite/test.19b.das.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:67: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:67"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:67: mv stdout \$baseline.tmp"
-echo DDSTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:67"
+( $at_check_trace; mv stdout $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/DDSTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:67: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:67"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:67: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:67"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_20
#AT_START_21
-# 21. DDSTest.at:68: DDS $abs_srcdir/dds-testsuite/test.19b.dds
-at_setup_line='DDSTest.at:68'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.19b.dds"
-$at_quiet $as_echo_n " 21: $at_desc "
+at_fn_group_banner 21 'DDSTest.at:68' \
+ "DDS \$abs_srcdir/dds-testsuite/test.19b.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "21. DDSTest.at:68: testing ..."
+ $as_echo "21. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4230,114 +3725,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.19b.dds
baseline=$abs_srcdir/dds-testsuite/test.19b.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:68: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:68 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:68"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:68: mv stdout \$baseline.tmp"
-echo DDSTest.at:68 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:68"
+( $at_check_trace; mv stdout $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/DDSTest.at:68"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:68: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:68 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:68"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:68: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:68 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:68"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_21
#AT_START_22
-# 22. DDSTest.at:69: DDS $abs_srcdir/dds-testsuite/test.2.dds
-at_setup_line='DDSTest.at:69'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.2.dds"
-$at_quiet $as_echo_n " 22: $at_desc "
+at_fn_group_banner 22 'DDSTest.at:69' \
+ "DDS \$abs_srcdir/dds-testsuite/test.2.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "22. DDSTest.at:69: testing ..."
+ $as_echo "22. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4345,114 +3808,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.2.dds
baseline=$abs_srcdir/dds-testsuite/test.2.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:69: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:69"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:69: mv stdout \$baseline.tmp"
-echo DDSTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:69"
+( $at_check_trace; mv stdout $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/DDSTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:69: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:69"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:69: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:69"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_22
#AT_START_23
-# 23. DDSTest.at:70: DDS $abs_srcdir/dds-testsuite/test.20.dds
-at_setup_line='DDSTest.at:70'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.20.dds"
-$at_quiet $as_echo_n " 23: $at_desc "
+at_fn_group_banner 23 'DDSTest.at:70' \
+ "DDS \$abs_srcdir/dds-testsuite/test.20.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "23. DDSTest.at:70: testing ..."
+ $as_echo "23. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4460,114 +3891,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.20.dds
baseline=$abs_srcdir/dds-testsuite/test.20.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:70: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:70"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:70: mv stdout \$baseline.tmp"
-echo DDSTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:70"
+( $at_check_trace; mv stdout $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/DDSTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:70: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:70"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:70: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:70"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_23
#AT_START_24
-# 24. DDSTest.at:71: DDS $abs_srcdir/dds-testsuite/test.3.dds
-at_setup_line='DDSTest.at:71'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.3.dds"
-$at_quiet $as_echo_n " 24: $at_desc "
+at_fn_group_banner 24 'DDSTest.at:71' \
+ "DDS \$abs_srcdir/dds-testsuite/test.3.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "24. DDSTest.at:71: testing ..."
+ $as_echo "24. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4575,114 +3974,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.3.dds
baseline=$abs_srcdir/dds-testsuite/test.3.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:71: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:71"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:71: mv stdout \$baseline.tmp"
-echo DDSTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:71"
+( $at_check_trace; mv stdout $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/DDSTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:71: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:71"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:71: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:71"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_24
#AT_START_25
-# 25. DDSTest.at:72: DDS $abs_srcdir/dds-testsuite/test.4.dds
-at_setup_line='DDSTest.at:72'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.4.dds"
-$at_quiet $as_echo_n " 25: $at_desc "
+at_fn_group_banner 25 'DDSTest.at:72' \
+ "DDS \$abs_srcdir/dds-testsuite/test.4.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "25. DDSTest.at:72: testing ..."
+ $as_echo "25. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4690,114 +4057,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.4.dds
baseline=$abs_srcdir/dds-testsuite/test.4.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:72: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:72 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:72"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:72: mv stdout \$baseline.tmp"
-echo DDSTest.at:72 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:72"
+( $at_check_trace; mv stdout $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/DDSTest.at:72"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:72: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:72 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:72"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:72: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:72 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:72"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_25
#AT_START_26
-# 26. DDSTest.at:73: DDS $abs_srcdir/dds-testsuite/test.6.dds
-at_setup_line='DDSTest.at:73'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.6.dds"
-$at_quiet $as_echo_n " 26: $at_desc "
+at_fn_group_banner 26 'DDSTest.at:73' \
+ "DDS \$abs_srcdir/dds-testsuite/test.6.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "26. DDSTest.at:73: testing ..."
+ $as_echo "26. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4805,114 +4140,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.6.dds
baseline=$abs_srcdir/dds-testsuite/test.6.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:73: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:73 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:73"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:73: mv stdout \$baseline.tmp"
-echo DDSTest.at:73 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:73"
+( $at_check_trace; mv stdout $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/DDSTest.at:73"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:73: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:73 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:73"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:73: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:73 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:73"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_26
#AT_START_27
-# 27. DDSTest.at:74: DDS $abs_srcdir/dds-testsuite/test.7.dds
-at_setup_line='DDSTest.at:74'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.7.dds"
-$at_quiet $as_echo_n " 27: $at_desc "
+at_fn_group_banner 27 'DDSTest.at:74' \
+ "DDS \$abs_srcdir/dds-testsuite/test.7.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "27. DDSTest.at:74: testing ..."
+ $as_echo "27. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4920,114 +4223,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.7.dds
baseline=$abs_srcdir/dds-testsuite/test.7.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:74: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:74 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:74"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:74: mv stdout \$baseline.tmp"
-echo DDSTest.at:74 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:74"
+( $at_check_trace; mv stdout $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/DDSTest.at:74"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:74: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:74 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:74"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:74: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:74 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:74"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_27
#AT_START_28
-# 28. DDSTest.at:75: DDS $abs_srcdir/dds-testsuite/test.8.dds
-at_setup_line='DDSTest.at:75'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.8.dds"
-$at_quiet $as_echo_n " 28: $at_desc "
+at_fn_group_banner 28 'DDSTest.at:75' \
+ "DDS \$abs_srcdir/dds-testsuite/test.8.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "28. DDSTest.at:75: testing ..."
+ $as_echo "28. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5035,114 +4306,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.8.dds
baseline=$abs_srcdir/dds-testsuite/test.8.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:75: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:75 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:75"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:75: mv stdout \$baseline.tmp"
-echo DDSTest.at:75 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:75"
+( $at_check_trace; mv stdout $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/DDSTest.at:75"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:75: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:75 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:75"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:75: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:75 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:75"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_28
#AT_START_29
-# 29. DDSTest.at:76: DDS $abs_srcdir/dds-testsuite/test.9.dds
-at_setup_line='DDSTest.at:76'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.9.dds"
-$at_quiet $as_echo_n " 29: $at_desc "
+at_fn_group_banner 29 'DDSTest.at:76' \
+ "DDS \$abs_srcdir/dds-testsuite/test.9.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "29. DDSTest.at:76: testing ..."
+ $as_echo "29. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5150,114 +4389,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.9.dds
baseline=$abs_srcdir/dds-testsuite/test.9.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:76: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:76 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:76"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:76: mv stdout \$baseline.tmp"
-echo DDSTest.at:76 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:76"
+( $at_check_trace; mv stdout $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/DDSTest.at:76"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:76: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:76 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:76"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:76: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:76 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:76"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_29
#AT_START_30
-# 30. DDSTest.at:80: DDS $abs_srcdir/dds-testsuite/test.21.dds
-at_setup_line='DDSTest.at:80'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.21.dds"
-$at_quiet $as_echo_n " 30: $at_desc "
+at_fn_group_banner 30 'DDSTest.at:80' \
+ "DDS \$abs_srcdir/dds-testsuite/test.21.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "30. DDSTest.at:80: testing ..."
+ $as_echo "30. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5265,114 +4472,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.21.dds
baseline=$abs_srcdir/dds-testsuite/test.21.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:80: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:80 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:80"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:80: mv stdout \$baseline.tmp"
-echo DDSTest.at:80 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:80"
+( $at_check_trace; mv stdout $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/DDSTest.at:80"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:80: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:80 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:80"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:80: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:80 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:80"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_30
#AT_START_31
-# 31. DDSTest.at:81: DDS $abs_srcdir/dds-testsuite/test.22.dds
-at_setup_line='DDSTest.at:81'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.22.dds"
-$at_quiet $as_echo_n " 31: $at_desc "
+at_fn_group_banner 31 'DDSTest.at:81' \
+ "DDS \$abs_srcdir/dds-testsuite/test.22.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "31. DDSTest.at:81: testing ..."
+ $as_echo "31. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5380,114 +4555,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.22.dds
baseline=$abs_srcdir/dds-testsuite/test.22.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:81: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:81 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:81"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:81: mv stdout \$baseline.tmp"
-echo DDSTest.at:81 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:81"
+( $at_check_trace; mv stdout $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/DDSTest.at:81"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:81: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:81 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:81"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:81: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:81 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:81"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_31
#AT_START_32
-# 32. DDSTest.at:82: DDS $abs_srcdir/dds-testsuite/test.23.dds
-at_setup_line='DDSTest.at:82'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.23.dds"
-$at_quiet $as_echo_n " 32: $at_desc "
+at_fn_group_banner 32 'DDSTest.at:82' \
+ "DDS \$abs_srcdir/dds-testsuite/test.23.dds" " "
at_xfail=no
test "" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "32. DDSTest.at:82: testing ..."
+ $as_echo "32. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5495,114 +4638,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.23.dds
baseline=$abs_srcdir/dds-testsuite/test.23.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:82: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:82 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:82"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:82: mv stdout \$baseline.tmp"
-echo DDSTest.at:82 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:82"
+( $at_check_trace; mv stdout $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/DDSTest.at:82"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:82: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:82 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:82"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:82: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:82 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:82"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_32
#AT_START_33
-# 33. DDSTest.at:83: DDS $abs_srcdir/dds-testsuite/test.24.dds
-at_setup_line='DDSTest.at:83'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.24.dds"
-$at_quiet $as_echo_n " 33: $at_desc "
+at_fn_group_banner 33 'DDSTest.at:83' \
+ "DDS \$abs_srcdir/dds-testsuite/test.24.dds" " "
at_xfail=no
test "xpass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "33. DDSTest.at:83: testing ..."
+ $as_echo "33. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5610,114 +4721,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.24.dds
baseline=$abs_srcdir/dds-testsuite/test.24.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:83: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:83 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:83"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:83: mv stdout \$baseline.tmp"
-echo DDSTest.at:83 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:83"
+( $at_check_trace; mv stdout $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/DDSTest.at:83"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:83: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:83 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:83"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:83: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:83 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:83"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_33
#AT_START_34
-# 34. DDSTest.at:86: DDS $abs_srcdir/dds-testsuite/test.25.dds
-at_setup_line='DDSTest.at:86'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.25.dds"
-$at_quiet $as_echo_n " 34: $at_desc "
+at_fn_group_banner 34 'DDSTest.at:86' \
+ "DDS \$abs_srcdir/dds-testsuite/test.25.dds" " "
at_xfail=no
test "xpass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "34. DDSTest.at:86: testing ..."
+ $as_echo "34. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5725,114 +4804,82 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.25.dds
baseline=$abs_srcdir/dds-testsuite/test.25.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:86: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:86 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:86"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:86: mv stdout \$baseline.tmp"
-echo DDSTest.at:86 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:86"
+( $at_check_trace; mv stdout $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/DDSTest.at:86"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:86: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:86 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:86"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:86: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:86 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:86"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_34
#AT_START_35
-# 35. DDSTest.at:87: DDS $abs_srcdir/dds-testsuite/test.26.dds
-at_setup_line='DDSTest.at:87'
-at_desc="DDS \$abs_srcdir/dds-testsuite/test.26.dds"
-$at_quiet $as_echo_n " 35: $at_desc "
+at_fn_group_banner 35 'DDSTest.at:87' \
+ "DDS \$abs_srcdir/dds-testsuite/test.26.dds" " "
at_xfail=no
test "xpass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "35. DDSTest.at:87: testing ..."
+ $as_echo "35. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5840,101 +4887,72 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dds-testsuite/test.26.dds
baseline=$abs_srcdir/dds-testsuite/test.26.dds.base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
# The --baselines=yes option works only for tests that write to stdout
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:87: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:87 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:87"
+( $at_check_trace; $abs_builddir/dds-test -p < $input || true
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:87: mv stdout \$baseline.tmp"
-echo DDSTest.at:87 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:87"
+( $at_check_trace; mv stdout $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/DDSTest.at:87"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
# Added '|| true' to ensure the command returns '0'
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:87: \$abs_builddir/dds-test -p < \$input || true"
-echo DDSTest.at:87 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
- ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:87"
+( $at_check_trace; $abs_builddir/dds-test -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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
+$at_failed && at_fn_log_failure
$at_traceon; }
# Need to compare either stdout or stderr
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DDSTest.at:87: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DDSTest.at:87 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:87"
+( $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_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_35
diff --git a/tests/DMRTest b/tests/DMRTest
index 399a171..ae50796 100755
--- a/tests/DMRTest
+++ b/tests/DMRTest
@@ -1,17 +1,17 @@
#! /bin/sh
-# Generated from DMRTest.at by GNU Autoconf 2.63.
+# Generated from DMRTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
# This test suite is free software; the Free Software Foundation gives
# unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,23 +19,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -43,7 +35,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -54,7 +52,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -77,13 +75,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -93,15 +84,16 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -113,12 +105,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -130,330 +126,319 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # 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
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
-else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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 ;;
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
fi
-
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
- done
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-fi
-fi
+} # as_fn_mkdir_p
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
+ as_expr=false
fi
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_basename=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf at gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
-
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -470,10 +455,12 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -482,29 +469,18 @@ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell"
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -519,49 +495,29 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -591,6 +547,11 @@ at_errexit_p=false
# Shall we be verbose? ':' means no, empty means yes.
at_verbose=:
at_quiet=
+# Running several jobs in parallel, 0 means as many as test groups.
+at_jobs=1
+at_traceon=:
+at_trace_echo=:
+at_check_filter_trace=:
# Shall we keep the debug scripts? Must be `:' when the suite is
# run by a debug script, so that the script doesn't remove itself.
@@ -605,6 +566,8 @@ at_list_p=false
at_clean=false
# Test groups to run
at_groups=
+# Whether to rerun failed tests.
+at_recheck=
# Whether a write failure occurred
at_write_fail=0
@@ -618,10 +581,10 @@ esac
# Whether -C is in effect.
at_change_dir=false
+# Whether to enable colored test results.
+at_color=no
# List of the tested programs.
at_tested=''
-# List of the all the test groups.
-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 [...]
# As many question marks as there are digits in the last test group number.
# Used to normalize the test group numbers so that `ls' lists them in
# numerical order.
@@ -720,11 +683,11 @@ at_help_all="1;DMRTest.at:211;parse dmr-testsuite/test_simple_1.xml;parse;
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;
+94;DMRTest.at:346;trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base;trans_ce;
+95;DMRTest.at:346;trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base;trans_ce;
+96;DMRTest.at:346;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:346;trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base;trans_ce;
+98;DMRTest.at:346;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;
@@ -863,12 +826,14 @@ at_help_all="1;DMRTest.at:211;parse dmr-testsuite/test_simple_1.xml;parse;
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;
"
+# List of the all the test groups.
+at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
-# at_func_validate_ranges [NAME...]
-# ---------------------------------
-# Validate and normalize the test group number contained in each
-# variable NAME. Leading zeroes are treated as decimal.
-at_func_validate_ranges ()
+# at_fn_validate_ranges NAME...
+# -----------------------------
+# Validate and normalize the test group number contained in each variable
+# NAME. Leading zeroes are treated as decimal.
+at_fn_validate_ranges ()
{
for at_grp
do
@@ -879,7 +844,7 @@ at_func_validate_ranges ()
fi
case $at_value in
0*) # We want to treat leading 0 as decimal, like expr and test, but
- # at_func_arith treats it as octal if it uses $(( )).
+ # AS_VAR_ARITH treats it as octal if it uses $(( )).
# With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
# expr fork, but it is not worth the effort to determine if the
# shell supports XSI when the user can just avoid leading 0.
@@ -905,8 +870,8 @@ do
fi
case $at_option in
- *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
- *) at_optarg= ;;
+ *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+ *) at_optarg= ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -928,6 +893,19 @@ do
at_clean=:
;;
+ --color )
+ at_color=always
+ ;;
+ --color=* )
+ case $at_optarg in
+ no | never | none) at_color=never ;;
+ auto | tty | if-tty) at_color=auto ;;
+ always | yes | force) at_color=always ;;
+ *) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
+ as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
+ esac
+ ;;
+
--debug | -d )
at_debug_p=:
;;
@@ -942,29 +920,31 @@ do
;;
--trace | -x )
- at_traceon='set -x'; at_traceoff='set +x'
+ at_traceon='set -x'
+ at_trace_echo=echo
+ at_check_filter_trace=at_fn_filter_trace
;;
[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
- at_func_validate_ranges at_option
- at_groups="$at_groups$at_option "
+ at_fn_validate_ranges at_option
+ as_fn_append at_groups "$at_option$as_nl"
;;
# Ranges
[0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
at_range_start=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_start
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.* \('$at_range_start' \)/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,$p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
-[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
at_range_end=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '1,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
[0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -980,11 +960,10 @@ do
at_range_end=$at_range_start
at_range_start=$at_tmp
fi
- at_func_validate_ranges at_range_start at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.*\( '$at_range_start' \)/\1/' \
- -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
# Directory selection.
@@ -994,6 +973,25 @@ do
--directory=* )
at_change_dir=:
at_dir=$at_optarg
+ if test x- = "x$at_dir" ; then
+ at_dir=./-
+ fi
+ ;;
+
+ # Parallel execution.
+ --jobs | -j )
+ at_jobs=0
+ ;;
+ --jobs=* | -j[0-9]* )
+ if test -n "$at_optarg"; then
+ at_jobs=$at_optarg
+ else
+ at_jobs=`expr X$at_option : 'X-j\(.*\)'`
+ fi
+ case $at_jobs in *[!0-9]*)
+ at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
+ as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
+ esac
;;
# Keywords.
@@ -1020,11 +1018,12 @@ do
at_groups_selected=`$as_echo "$at_groups_selected" |
grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
done
- # Smash the newlines.
- at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
- tr "$as_nl" ' '
- `
- at_groups="$at_groups$at_groups_selected "
+ # Smash the keywords.
+ at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
+ as_fn_append at_groups "$at_groups_selected$as_nl"
+ ;;
+ --recheck)
+ at_recheck=:
;;
--baselines )
at_prev=--baselines
@@ -1042,14 +1041,12 @@ do
# Reject names that are not valid shell variable names.
case $at_envvar in
'' | [0-9]* | *[!_$as_cr_alnum]* )
- { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
-$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
esac
at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
# Export now, but save eval for later and for debug scripts.
export $at_envvar
- at_debug_args="$at_debug_args $at_envvar='$at_value'"
+ as_fn_append at_debug_args " $at_envvar='$at_value'"
;;
*) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -1060,32 +1057,54 @@ $as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
done
# Verify our last option didn't require an argument
-if test -n "$at_prev"; then
- { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
-$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
- { (exit 1); exit 1; }; }
+if test -n "$at_prev"; then :
+ as_fn_error $? "\`$at_prev' requires an argument"
fi
+# The file containing the suite.
+at_suite_log=$at_dir/$as_me.log
# Selected test groups.
-if test -z "$at_groups"; then
+if test -z "$at_groups$at_recheck"; then
at_groups=$at_groups_all
else
+ if test -n "$at_recheck" && test -r "$at_suite_log"; then
+ at_oldfails=`sed -n '
+ /^Failed tests:$/,/^Skipped tests:$/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^Unexpected passes:$/,/^## Detailed failed tests/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^## Detailed failed tests/q
+ ' "$at_suite_log"`
+ as_fn_append at_groups "$at_oldfails$as_nl"
+ fi
# Sort the tests, removing duplicates.
- at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
+ at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
+fi
+
+if test x"$at_color" = xalways \
+ || { test x"$at_color" = xauto && test -t 1; }; then
+ at_red=`printf '\033[0;31m'`
+ at_grn=`printf '\033[0;32m'`
+ at_lgn=`printf '\033[1;32m'`
+ at_blu=`printf '\033[1;34m'`
+ at_std=`printf '\033[m'`
+else
+ at_red= at_grn= at_lgn= at_blu= at_std=
fi
##
## Process package specific options when _not_ supplied.
##
-if $at_arg_given_baselines; then
- :
+if $at_arg_given_baselines; then :
+
else
baselines=
fi
-
# Help message.
if $at_help_p; then
cat <<_ATEOF || at_write_fail=1
@@ -1094,16 +1113,17 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
Run all the tests, or the selected TESTS, given by numeric ranges, and
save a detailed log file. Upon failure, create debugging scripts.
-You should not change environment variables unless explicitly passed
-as command line arguments. Set \`AUTOTEST_PATH' to select the executables
+Do not change environment variables directly. Instead, set them via
+command line arguments. Set \`AUTOTEST_PATH' to select the executables
to exercise. Each relative directory is expanded as build and source
-directories relatively to the top level of this distribution. E.g.,
+directories relative to the top level of this distribution.
+E.g., from within the build directory /tmp/foo-1.0, invoking this:
$ $0 AUTOTEST_PATH=bin
-possibly amounts into
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
- PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
+ PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
_ATEOF
cat <<_ATEOF || at_write_fail=1
@@ -1118,9 +1138,14 @@ cat <<_ATEOF || at_write_fail=1
Execution tuning:
-C, --directory=DIR
change to directory DIR before starting
+ --color[=never|auto|always]
+ enable colored test results on terminal, or always
+ -j, --jobs[=N]
+ Allow N jobs at once; infinite jobs with no arg (default 1)
-k, --keywords=KEYWORDS
select the tests matching all the comma-separated KEYWORDS
multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
+ --recheck select all tests that failed or passed unexpectedly last time
-e, --errexit abort as soon as a test fails; implies --debug
-v, --verbose force more detailed output
default for debugging scripts
@@ -1146,64 +1171,69 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-libdap 3.18.3 test suite: dmr-test test groups:
+libdap 3.19.0 test suite: dmr-test test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
_ATEOF
- # Passing at_groups is tricky. We cannot use it to form a literal string
- # or regexp because of the limitation of AIX awk. And Solaris' awk
- # doesn't grok more than 99 fields in a record, so we have to use `split'.
- # at_groups needs to be space-separated for this script to work.
- case $at_groups in
- *"$as_nl"* )
- at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
- esac
- $as_echo "$at_groups$as_nl$at_help_all" |
- awk 'BEGIN { FS = ";" }
- NR == 1 {
- for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
+ # Pass an empty line as separator between selected groups and help.
+ $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
+ awk 'NF == 1 && FS != ";" {
+ selected[$ 1] = 1
next
}
- {
+ /^$/ { FS = ";" }
+ NF > 0 {
if (selected[$ 1]) {
printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
- if ($ 4) printf " %s\n", $ 4
+ if ($ 4) {
+ lmax = 79
+ indent = " "
+ line = indent
+ len = length (line)
+ n = split ($ 4, a, " ")
+ for (i = 1; i <= n; i++) {
+ l = length (a[i]) + 1
+ if (i > 1 && len + l > lmax) {
+ print line
+ line = indent " " a[i]
+ len = length (line)
+ } else {
+ line = line " " a[i]
+ len += l
+ }
+ }
+ if (n)
+ print line
+ }
}
}' || at_write_fail=1
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (libdap 3.18.3)" &&
- cat <<\_ACEOF || at_write_fail=1
+ $as_echo "$as_me (libdap 3.19.0)" &&
+ cat <<\_ATEOF || at_write_fail=1
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This test suite is free software; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
-_ACEOF
+_ATEOF
exit $at_write_fail
fi
-# Should we print banners? at_groups is space-separated for entire test,
-# newline-separated if only a subset of the testsuite is run.
-case $at_groups in
- *' '*' '* | *"$as_nl"*"$as_nl"* )
- at_print_banners=: ;;
+# Should we print banners? Yes if more than one test is run.
+case $at_groups in #(
+ *$as_nl* )
+ at_print_banners=: ;; #(
* ) at_print_banners=false ;;
esac
-# Text for banner N, set to empty once printed.
+# Text for banner N, set to a single space once printed.
# Take any -C into account.
if $at_change_dir ; then
- if test x- = "x$at_dir" ; then
- at_dir=./-
- fi
test x != "x$at_dir" && cd "$at_dir" \
- || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
-$as_echo "$as_me: error: unable to change directory" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error $? "unable to change directory"
at_dir=`pwd`
fi
@@ -1211,13 +1241,11 @@ fi
for at_file in atconfig atlocal
do
test -r $at_file || continue
- . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
-$as_echo "$as_me: error: invalid content: $at_file" >&2;}
- { (exit 1); exit 1; }; }
+ . ./$at_file || as_fn_error $? "invalid content: $at_file"
done
# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: ${at_top_build_prefix=$at_top_builddir}
+: "${at_top_build_prefix=$at_top_builddir}"
# Perform any assignments requested during argument parsing.
eval "$at_debug_args"
@@ -1228,8 +1256,7 @@ if test -n "$at_top_srcdir"; then
builddir=../..
for at_dir_var in srcdir top_srcdir top_build_prefix
do
- at_val=`eval 'as_val=${'at_$at_dir_var'}
- $as_echo "$as_val"'`
+ eval at_val=\$at_$at_dir_var
case $at_val in
[\\/$]* | ?:[\\/]* ) at_prefix= ;;
*) at_prefix=../../ ;;
@@ -1238,9 +1265,9 @@ if test -n "$at_top_srcdir"; then
done
fi
-## ------------------- ##
-## Directory structure ##
-## ------------------- ##
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
# This is the set of directories and files used by this script
# (non-literals are capitalized):
@@ -1271,12 +1298,14 @@ fi
# The directory the whole suite works in.
# Should be absolute to let the user `cd' at will.
at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite.
+# The file containing the suite ($at_dir might have changed since earlier).
at_suite_log=$at_dir/$as_me.log
# The directory containing helper files per test group.
at_helper_dir=$at_suite_dir/at-groups
# Stop file: if it exists, do not start new jobs.
at_stop_file=$at_suite_dir/at-stop
+# The fifo used for the job dispatcher.
+at_job_fifo=$at_suite_dir/at-job-fifo
if $at_clean; then
test -d "$at_suite_dir" &&
@@ -1300,23 +1329,23 @@ for as_dir in $AUTOTEST_PATH $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
+ test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
case $as_dir in
[\\/]* | ?:[\\/]* )
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
;;
* )
if test -z "$at_top_build_prefix"; then
# Stand-alone test suite.
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
else
# Embedded test suite.
- at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
- at_path=$at_path$at_top_srcdir/$as_dir
+ as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
+ as_fn_append at_path "$at_top_srcdir/$as_dir"
fi
;;
esac
-done
+ done
IFS=$as_save_IFS
@@ -1330,7 +1359,7 @@ for as_dir in $at_path
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -d "$as_dir" || continue
+ test -d "$as_dir" || continue
case $as_dir in
[\\/]* | ?:[\\/]* ) ;;
* ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1338,15 +1367,18 @@ esac
case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
*$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
$PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
- *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
+ *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
esac
-done
+ done
IFS=$as_save_IFS
PATH=$at_new_path
export PATH
# Setting up the FDs.
+
+
+
# 5 is the log file. Not to be overwritten if `-d'.
if $at_debug_p; then
at_suite_log=/dev/null
@@ -1356,43 +1388,28 @@ fi
exec 5>>"$at_suite_log"
# Banners and logs.
-cat <<\_ASBOX
-## ----------------------------------- ##
-## libdap 3.18.3 test suite: dmr-test. ##
-## ----------------------------------- ##
-_ASBOX
+$as_echo "## ----------------------------------- ##
+## libdap 3.19.0 test suite: dmr-test. ##
+## ----------------------------------- ##"
{
- cat <<\_ASBOX
-## ----------------------------------- ##
-## libdap 3.18.3 test suite: dmr-test. ##
-## ----------------------------------- ##
-_ASBOX
+ $as_echo "## ----------------------------------- ##
+## libdap 3.19.0 test suite: dmr-test. ##
+## ----------------------------------- ##"
echo
$as_echo "$as_me: command line was:"
$as_echo " \$ $0 $at_cli_args"
echo
- # Try to find a few ChangeLogs in case it might help determining the
- # exact version. Use the relative dir: if the top dir is a symlink,
- # find will not follow it (and options to follow the links are not
- # portable), which would result in no output here. Prune directories
- # matching the package tarname, since they tend to be leftovers from
- # `make dist' or `make distcheck' and contain redundant or stale logs.
- if test -n "$at_top_srcdir"; then
- cat <<\_ASBOX
-## ----------- ##
-## ChangeLogs. ##
-## ----------- ##
-_ASBOX
+ # If ChangeLog exists, list a few lines in case it might help determining
+ # the exact version.
+ if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
+ $as_echo "## ---------- ##
+## ChangeLog. ##
+## ---------- ##"
+ echo
+ sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
echo
- for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
- do
- $as_echo "$as_me: $at_file:"
- sed 's/^/| /;10q' $at_file
- echo
- done
-
fi
{
@@ -1425,8 +1442,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
}
@@ -1443,53 +1460,80 @@ IFS=$as_save_IFS
} >&5
-## --------------- ##
-## Shell functions ##
-## --------------- ##
+## ------------------------- ##
+## Autotest shell functions. ##
+## ------------------------- ##
-# at_func_banner NUMBER
-# ---------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups
-# and this particular banner has not yet been printed.
-at_func_banner ()
+# at_fn_banner NUMBER
+# -------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups and
+# this particular banner has not yet been printed.
+at_fn_banner ()
{
$at_print_banners || return 0
eval at_banner_text=\$at_banner_text_$1
- test "x$at_banner_text" = x && return 0
- eval at_banner_text_$1=
- $as_echo "$as_nl$at_banner_text$as_nl"
-} # at_func_banner
+ test "x$at_banner_text" = "x " && return 0
+ eval "at_banner_text_$1=\" \""
+ if test -z "$at_banner_text"; then
+ $at_first || echo
+ else
+ $as_echo "$as_nl$at_banner_text$as_nl"
+ fi
+} # at_fn_banner
-# at_func_check_newline COMMAND
-# -----------------------------
-# Test if COMMAND includes a newline and, if so, print a message and return
-# exit code 1
-at_func_check_newline ()
+# at_fn_check_prepare_notrace REASON LINE
+# ---------------------------------------
+# Perform AT_CHECK preparations for the command at LINE for an untraceable
+# command; REASON is the reason for disabling tracing.
+at_fn_check_prepare_notrace ()
{
- case "$1" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
- return 1 ;;
- *) return 0 ;;
- esac
+ $at_trace_echo "Not enabling shell tracing (command contains $1)"
+ $as_echo "$2" >"$at_check_line_file"
+ at_check_trace=: at_check_filter=:
+ : >"$at_stdout"; : >"$at_stderr"
}
-# at_func_filter_trace EXIT-CODE
+# at_fn_check_prepare_trace LINE
# ------------------------------
-# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
-# and the other lines (on file "$at_stderr"). Return the exit code EXIT-CODE.
-at_func_filter_trace ()
+# Perform AT_CHECK preparations for the command at LINE for a traceable
+# command.
+at_fn_check_prepare_trace ()
{
+ $as_echo "$1" >"$at_check_line_file"
+ at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
+ : >"$at_stdout"; : >"$at_stderr"
+}
+
+# at_fn_check_prepare_dynamic COMMAND LINE
+# ----------------------------------------
+# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
+# preparation function.
+at_fn_check_prepare_dynamic ()
+{
+ case $1 in
+ *$as_nl*)
+ at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+ *)
+ at_fn_check_prepare_trace "$2" ;;
+ esac
+}
+
+# at_fn_filter_trace
+# ------------------
+# Remove the lines in the file "$at_stderr" generated by "set -x" and print
+# them to stderr.
+at_fn_filter_trace ()
+{
+ mv "$at_stderr" "$at_stder1"
grep '^ *+' "$at_stder1" >&2
grep -v '^ *+' "$at_stder1" >"$at_stderr"
- return $1
}
-# at_func_log_failure FILE-LIST
-# -----------------------------
+# at_fn_log_failure FILE-LIST
+# ---------------------------
# Copy the files in the list on stdout with a "> " prefix, and exit the shell
# with a failure exit code.
-at_func_log_failure ()
+at_fn_log_failure ()
{
for file
do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1497,56 +1541,62 @@ at_func_log_failure ()
exit 1
}
-# at_func_check_skip EXIT-CODE
-# ----------------------------
-# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
-# with that same exit code.
-at_func_check_skip ()
+# at_fn_check_skip EXIT-CODE LINE
+# -------------------------------
+# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
+# the test group subshell with that same exit code. Use LINE in any report
+# about test failure.
+at_fn_check_skip ()
{
case $1 in
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$2: hard failure"; exit 99;;
77) echo 77 > "$at_status_file"; exit 77;;
esac
}
-# at_func_check_status EXPECTED EXIT-CODE LINE
-# --------------------------------------------
-# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
-# Otherwise, if it is 77 exit the shell with that same exit code; if it is
-# anything else print an error message and fail the test.
-at_func_check_status ()
+# at_fn_check_status EXPECTED EXIT-CODE LINE
+# ------------------------------------------
+# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
+# Otherwise, if it is 77 or 99, exit the test group subshell with that same
+# exit code; if it is anything else print an error message referring to LINE,
+# and fail the test.
+at_fn_check_status ()
{
case $2 in
$1 ) ;;
77) echo 77 > "$at_status_file"; exit 77;;
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$3: hard failure"; exit 99;;
*) $as_echo "$3: exit code was $2, expected $1"
at_failed=:;;
esac
}
-# at_func_diff_devnull FILE
-# -------------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless
-# diff invocations.
-at_func_diff_devnull ()
+# at_fn_diff_devnull FILE
+# -----------------------
+# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
+# invocations.
+at_fn_diff_devnull ()
{
test -s "$1" || return 0
$at_diff "$at_devnull" "$1"
}
-# at_func_test NUMBER
-# -------------------
+# at_fn_test NUMBER
+# -----------------
# Parse out test NUMBER from the tail of this file.
-at_func_test ()
+at_fn_test ()
{
eval at_sed=\$at_sed$1
sed "$at_sed" "$at_myself" > "$at_test_source"
}
-# at_func_create_debugging_script
-# -------------------------------
+# at_fn_create_debugging_script
+# -----------------------------
# Create the debugging script $at_group_dir/run which will reproduce the
# current test group.
-at_func_create_debugging_script ()
+at_fn_create_debugging_script ()
{
{
echo "#! /bin/sh" &&
@@ -1558,34 +1608,13 @@ at_func_create_debugging_script ()
chmod +x "$at_group_dir/run"
}
-# at_func_arith
-# -------------
-# Arithmetic evaluation, avoids expr if the shell is sane. The
-# interpretation of leading zeroes is unspecified.
-#
-# subshell and eval are needed to keep Solaris sh from bailing out:
-if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
- # With "$@", bash does not split positional parameters:
- eval 'at_func_arith ()
- {
- at_func_arith_result=$(( $* ))
- }'
-else
- at_func_arith ()
- {
- at_func_arith_result=`expr "$@"`
- }
-fi
-
-## ---------------------- ##
-## End of shell functions ##
-## ---------------------- ##
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
{
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Tested programs. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
} >&5
@@ -1593,34 +1622,35 @@ _ASBOX
for at_program in : $at_tested
do
test "$at_program" = : && continue
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $at_program in
+ [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
+ * )
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -f "$as_dir/$at_program" && break
-done
+ test -f "$as_dir/$at_program" && break
+ done
IFS=$as_save_IFS
- if test -f "$as_dir/$at_program"; then
+ at_program_=$as_dir/$at_program ;;
+ esac
+ if test -f "$at_program_"; then
{
- $as_echo "$at_srcdir/DMRTest.at:3: $as_dir/$at_program --version"
- "$as_dir/$at_program" --version </dev/null
+ $as_echo "$at_srcdir/DMRTest.at:3: $at_program_ --version"
+ "$at_program_" --version </dev/null
echo
} >&5 2>&1
else
- { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
-$as_echo "$as_me: error: cannot find $at_program" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find $at_program" "$LINENO" 5
fi
done
{
- cat <<\_ASBOX
-## ------------------ ##
+ $as_echo "## ------------------ ##
## Running the tests. ##
-## ------------------ ##
-_ASBOX
+## ------------------ ##"
} >&5
at_start_date=`date`
@@ -1628,11 +1658,8 @@ at_start_time=`date +%s 2>/dev/null`
$as_echo "$as_me: starting at: $at_start_date" >&5
# Create the master directory if it doesn't already exist.
-test -d "$at_suite_dir" ||
- mkdir "$at_suite_dir" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
-$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
- { (exit 1); exit 1; }; }
+as_dir="$at_suite_dir"; as_fn_mkdir_p ||
+ as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
# Can we diff with `/dev/null'? DU 5.0 refuses.
if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1666,28 +1693,40 @@ BEGIN { FS="" }
if (test == "'"$at_group"'") exit
}' "$at_myself" > "$at_suite_dir/at-source-lines" &&
. "$at_suite_dir/at-source-lines" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
-$as_echo "$as_me: error: cannot create test line number cache" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot create test line number cache" "$LINENO" 5
rm -f "$at_suite_dir/at-source-lines"
+# Set number of jobs for `-j'; avoid more jobs than test groups.
+set X $at_groups; shift; at_max_jobs=$#
+if test $at_max_jobs -eq 0; then
+ at_jobs=1
+fi
+if test $at_jobs -ne 1 &&
+ { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
+ at_jobs=$at_max_jobs
+fi
+
+# If parallel mode, don't output banners, don't split summary lines.
+if test $at_jobs -ne 1; then
+ at_print_banners=false
+ at_quiet=:
+fi
+
# Set up helper dirs.
rm -rf "$at_helper_dir" &&
mkdir "$at_helper_dir" &&
cd "$at_helper_dir" &&
{ test -z "$at_groups" || mkdir $at_groups; } ||
-{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
-$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
- { (exit 1); exit 1; }; }
+as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
# Functions for running a test group. We leave the actual
# test group execution outside of a shell function in order
# to avoid hitting zsh 4.x exit status bugs.
-# at_func_group_prepare
-# ---------------------
-# Prepare running a test group
-at_func_group_prepare ()
+# at_fn_group_prepare
+# -------------------
+# Prepare for running a test group.
+at_fn_group_prepare ()
{
# The directory for additional per-group helper files.
at_job_dir=$at_helper_dir/$at_group
@@ -1698,79 +1737,43 @@ at_func_group_prepare ()
# The files containing the output of the tested commands.
at_stdout=$at_job_dir/stdout
at_stder1=$at_job_dir/stder1
- at_stderr=$at_job_dir/stderr
- # The file containing the code for a test group.
- at_test_source=$at_job_dir/test-source
- # The file containing dates.
- at_times_file=$at_job_dir/times
-
- # Be sure to come back to the top test directory.
- cd "$at_suite_dir"
-
- # Clearly separate the test groups when verbose.
- $at_first || $at_verbose echo
-
- at_group_normalized=$at_group
-
- eval 'while :; do
- case $at_group_normalized in #(
- '"$at_format"'*) break;;
- esac
- at_group_normalized=0$at_group_normalized
- done'
-
-
- # Create a fresh directory for the next test group, and enter.
- at_group_dir=$at_suite_dir/$at_group_normalized
- at_group_log=$at_group_dir/$as_me.log
- if test -d "$at_group_dir"; then
- find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
- rm -fr "$at_group_dir" ||
- { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
- fi
- # Be tolerant if the above `rm' was not able to remove the directory.
- { as_dir="$at_group_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ at_stderr=$at_job_dir/stderr
+ # The file containing the code for a test group.
+ at_test_source=$at_job_dir/test-source
+ # The file containing dates.
+ at_times_file=$at_job_dir/times
+
+ # Be sure to come back to the top test directory.
+ cd "$at_suite_dir"
+
+ # Clearly separate the test groups when verbose.
+ $at_first || $at_verbose echo
+
+ at_group_normalized=$at_group
+
+ eval 'while :; do
+ case $at_group_normalized in #(
+ '"$at_format"'*) break;;
+ esac
+ at_group_normalized=0$at_group_normalized
+ done'
+
+
+ # Create a fresh directory for the next test group, and enter.
+ # If one already exists, the user may have invoked ./run from
+ # within that directory; we remove the contents, but not the
+ # directory itself, so that we aren't pulling the rug out from
+ # under the shell's notion of the current directory.
+ at_group_dir=$at_suite_dir/$at_group_normalized
+ at_group_log=$at_group_dir/$as_me.log
+ if test -d "$at_group_dir"; then
+ find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
+ rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
+fi ||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
+ # Be tolerant if the above `rm' was not able to remove the directory.
+ as_dir="$at_group_dir"; as_fn_mkdir_p
echo 0 > "$at_status_file"
@@ -1783,9 +1786,29 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
fi
}
-# at_func_group_postprocess
-# -------------------------
-at_func_group_postprocess ()
+# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
+# -------------------------------------------------
+# Declare the test group ORDINAL, located at LINE with group description DESC,
+# and residing under BANNER. Use PAD to align the status column.
+at_fn_group_banner ()
+{
+ at_setup_line="$2"
+ test -n "$5" && at_fn_banner $5
+ at_desc="$3"
+ case $1 in
+ [0-9]) at_desc_line=" $1: ";;
+ [0-9][0-9]) at_desc_line=" $1: " ;;
+ *) at_desc_line="$1: " ;;
+ esac
+ as_fn_append at_desc_line "$3$4"
+ $at_quiet $as_echo_n "$at_desc_line"
+ echo "# -*- compilation -*-" >> "$at_group_log"
+}
+
+# at_fn_group_postprocess
+# -----------------------
+# Perform cleanup after running a test group.
+at_fn_group_postprocess ()
{
# Be sure to come back to the suite directory, in particular
# since below we might `rm' the group directory we are in currently.
@@ -1798,6 +1821,7 @@ at_func_group_postprocess ()
report this failure to <opendap-tech at opendap.org>.
_ATEOF
$as_echo "$at_setup_line" >"$at_check_line_file"
+ at_status=99
fi
$at_verbose $as_echo_n "$at_group. $at_setup_line: "
$as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1806,31 +1830,41 @@ _ATEOF
at_msg="UNEXPECTED PASS"
at_res=xpass
at_errexit=$at_errexit_p
+ at_color=$at_red
;;
no:0)
at_msg="ok"
at_res=pass
at_errexit=false
+ at_color=$at_grn
;;
*:77)
at_msg='skipped ('`cat "$at_check_line_file"`')'
at_res=skip
at_errexit=false
+ at_color=$at_blu
+ ;;
+ no:* | *:99)
+ at_msg='FAILED ('`cat "$at_check_line_file"`')'
+ at_res=fail
+ at_errexit=$at_errexit_p
+ at_color=$at_red
;;
yes:*)
at_msg='expected failure ('`cat "$at_check_line_file"`')'
at_res=xfail
at_errexit=false
- ;;
- no:*)
- at_msg='FAILED ('`cat "$at_check_line_file"`')'
- at_res=fail
- at_errexit=$at_errexit_p
+ at_color=$at_lgn
;;
esac
echo "$at_res" > "$at_job_dir/$at_res"
- # Make sure there is a separator even with long titles.
- $as_echo " $at_msg"
+ # In parallel mode, output the summary line only afterwards.
+ if test $at_jobs -ne 1 && test -n "$at_verbose"; then
+ $as_echo "$at_desc_line $at_color$at_msg$at_std"
+ else
+ # Make sure there is a separator even with long titles.
+ $as_echo " $at_color$at_msg$at_std"
+ fi
at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
case $at_status in
0|77)
@@ -1845,9 +1879,13 @@ _ATEOF
$as_echo "$at_log_msg" >> "$at_group_log"
$as_echo "$at_log_msg" >&5
- # Cleanup the group directory, unless the user wants the files.
- if $at_debug_p; then
- at_func_create_debugging_script
+ # Cleanup the group directory, unless the user wants the files
+ # or the success was unexpected.
+ if $at_debug_p || test $at_res = xpass; then
+ at_fn_create_debugging_script
+ if test $at_res = xpass && $at_errexit; then
+ echo stop > "$at_stop_file"
+ fi
else
if test -d "$at_group_dir"; then
find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1864,7 +1902,7 @@ _ATEOF
# Upon failure, keep the group directory for autopsy, and create
# the debugging script. With -e, do not start any further tests.
- at_func_create_debugging_script
+ at_fn_create_debugging_script
if $at_errexit; then
echo stop > "$at_stop_file"
fi
@@ -1877,22 +1915,134 @@ _ATEOF
## Driver loop. ##
## ------------ ##
+
+if (set -m && set +m && set +b) >/dev/null 2>&1; then
+ set +b
+ at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
+else
+ at_job_control_on=: at_job_control_off=: at_job_group=
+fi
+
+for at_signal in 1 2 15; do
+ trap 'set +x; set +e
+ $at_job_control_off
+ at_signal='"$at_signal"'
+ echo stop > "$at_stop_file"
+ trap "" $at_signal
+ at_pgids=
+ for at_pgid in `jobs -p 2>/dev/null`; do
+ at_pgids="$at_pgids $at_job_group$at_pgid"
+ done
+ test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
+ wait
+ if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
+ echo >&2
+ fi
+ at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
+ set x $at_signame
+ test 1 -gt 2 && at_signame=$at_signal
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
+$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
+ as_fn_arith 128 + $at_signal && exit_status=$as_val
+ as_fn_exit $exit_status' $at_signal
+done
+
rm -f "$at_stop_file"
at_first=:
-for at_group in $at_groups; do
- at_func_group_prepare
- if cd "$at_group_dir" &&
- at_func_test $at_group &&
- . "$at_test_source"; then :; else
- { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
+if test $at_jobs -ne 1 &&
+ rm -f "$at_job_fifo" &&
+ test -n "$at_job_group" &&
+ ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
+then
+ # FIFO job dispatcher.
+
+ trap 'at_pids=
+ for at_pid in `jobs -p`; do
+ at_pids="$at_pids $at_job_group$at_pid"
+ done
+ if test -n "$at_pids"; then
+ at_sig=TSTP
+ test "${TMOUT+set}" = set && at_sig=STOP
+ kill -$at_sig $at_pids 2>/dev/null
+ fi
+ kill -STOP $$
+ test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
+
+ echo
+ # Turn jobs into a list of numbers, starting from 1.
+ at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
+
+ set X $at_joblist
+ shift
+ for at_group in $at_groups; do
+ $at_job_control_on 2>/dev/null
+ (
+ # Start one test group.
+ $at_job_control_off
+ if $at_first; then
+ exec 7>"$at_job_fifo"
+ else
+ exec 6<&-
+ fi
+ trap 'set +x; set +e
+ trap "" PIPE
+ echo stop > "$at_stop_file"
+ echo >&7
+ as_fn_exit 141' PIPE
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"
+ then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
- at_failed=:
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ echo >&7
+ ) &
+ $at_job_control_off
+ if $at_first; then
+ at_first=false
+ exec 6<"$at_job_fifo" 7>"$at_job_fifo"
+ fi
+ shift # Consume one token.
+ if test $# -gt 0; then :; else
+ read at_token <&6 || break
+ set x $*
+ fi
+ test -f "$at_stop_file" && break
+ done
+ exec 7>&-
+ # Read back the remaining ($at_jobs - 1) tokens.
+ set X $at_joblist
+ shift
+ if test $# -gt 0; then
+ shift
+ for at_job
+ do
+ read at_token
+ done <&6
fi
- at_func_group_postprocess
- test -f "$at_stop_file" && break
- at_first=false
-done
+ exec 6<&-
+ wait
+else
+ # Run serially, avoid forks and other potential surprises.
+ for at_group in $at_groups; do
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"; then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ test -f "$at_stop_file" && break
+ at_first=false
+ done
+fi
# Wrap up the test suite with summary statistics.
cd "$at_helper_dir"
@@ -1913,12 +2063,9 @@ set X $at_xfail_list; shift; at_xfail_count=$#
set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
set X $at_skip_list; shift; at_skip_count=$#
-at_func_arith $at_group_count - $at_skip_count
-at_run_count=$at_func_arith_result
-at_func_arith $at_xpass_count + $at_fail_count
-at_unexpected_count=$at_func_arith_result
-at_func_arith $at_xfail_count + $at_fail_count
-at_total_fail_count=$at_func_arith_result
+as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
+as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
+as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
# Back to the top directory.
cd "$at_dir"
@@ -1930,35 +2077,26 @@ at_stop_time=`date +%s 2>/dev/null`
$as_echo "$as_me: ending at: $at_stop_date" >&5
case $at_start_time,$at_stop_time in
[0-9]*,[0-9]*)
- at_func_arith $at_stop_time - $at_start_time
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_s / 60
- at_duration_m=$at_func_arith_result
- at_func_arith $at_duration_m / 60
- at_duration_h=$at_func_arith_result
- at_func_arith $at_duration_s % 60
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_m % 60
- at_duration_m=$at_func_arith_result
+ as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
+ as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
+ as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
+ as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
+ as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
$as_echo "$as_me: test suite duration: $at_duration" >&5
;;
esac
echo
-cat <<\_ASBOX
-## ------------- ##
+$as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
{
echo
- cat <<\_ASBOX
-## ------------- ##
+ $as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
} >&5
@@ -1976,12 +2114,14 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
at_result="$at_result $at_were run, one failed"
fi
at_result="$at_result unexpectedly and inhibited subsequent tests."
+ at_color=$at_red
else
# Don't you just love exponential explosion of the number of cases?
+ at_color=$at_red
case $at_xpass_count:$at_fail_count:$at_xfail_count in
# So far, so good.
- 0:0:0) at_result="$at_result $at_were successful." ;;
- 0:0:*) at_result="$at_result behaved as expected." ;;
+ 0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
+ 0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
# Some unexpected failures
0:*:0) at_result="$at_result $at_were run,
@@ -2027,18 +2167,16 @@ $at_skip_count tests were skipped." ;;
esac
if test $at_unexpected_count = 0; then
- echo "$at_result"
+ echo "$at_color$at_result$at_std"
echo "$at_result" >&5
else
- echo "ERROR: $at_result" >&2
+ echo "${at_color}ERROR: $at_result$at_std" >&2
echo "ERROR: $at_result" >&5
{
echo
- cat <<\_ASBOX
-## ------------------------ ##
+ $as_echo "## ------------------------ ##
## Summary of the failures. ##
-## ------------------------ ##
-_ASBOX
+## ------------------------ ##"
# Summary of failed and skipped tests.
if test $at_fail_count != 0; then
@@ -2057,11 +2195,9 @@ _ASBOX
echo
fi
if test $at_fail_count != 0; then
- cat <<\_ASBOX
-## ---------------------- ##
+ $as_echo "## ---------------------- ##
## Detailed failed tests. ##
-## ---------------------- ##
-_ASBOX
+## ---------------------- ##"
echo
for at_group in $at_fail_list
do
@@ -2093,19 +2229,21 @@ _ASBOX
_ASBOX
echo
- $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
+ if $at_debug_p; then
+ at_msg='per-test log files'
+ else
+ at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
+ fi
+ $as_echo "Please send $at_msg and all information you think might help:
To: <opendap-tech at opendap.org>
- Subject: [libdap 3.18.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [libdap 3.19.0] $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
+be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
"
- if test $at_debug_p = false; then
- echo
- echo 'You may investigate any problem if you feel able to do so, in which'
- echo 'case the test suite provides a good starting point. Its output may'
- $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
- echo
- fi
- exit 1
+ exit 1
fi
exit 0
@@ -2114,15 +2252,12 @@ exit 0
## Actual tests. ##
## ------------- ##
#AT_START_1
-# 1. DMRTest.at:211: parse dmr-testsuite/test_simple_1.xml
-at_setup_line='DMRTest.at:211'
-at_desc="parse dmr-testsuite/test_simple_1.xml"
-$at_quiet $as_echo_n " 1: $at_desc "
+at_fn_group_banner 1 'DMRTest.at:211' \
+ "parse dmr-testsuite/test_simple_1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "1. DMRTest.at:211: testing ..."
+ $as_echo "1. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2130,111 +2265,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:211: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:211 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:211: mv stdout \$baseline.tmp"
-echo DMRTest.at:211 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:211"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:211: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:211 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:211: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:211 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:211"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_1
#AT_START_2
-# 2. DMRTest.at:212: parse dmr-testsuite/test_simple_2.xml
-at_setup_line='DMRTest.at:212'
-at_desc="parse dmr-testsuite/test_simple_2.xml"
-$at_quiet $as_echo_n " 2: $at_desc "
+at_fn_group_banner 2 'DMRTest.at:212' \
+ "parse dmr-testsuite/test_simple_2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "2. DMRTest.at:212: testing ..."
+ $as_echo "2. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2242,111 +2345,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:212: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:212 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:212: mv stdout \$baseline.tmp"
-echo DMRTest.at:212 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:212"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:212: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:212 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:212: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:212 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:212"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_2
#AT_START_3
-# 3. DMRTest.at:213: parse dmr-testsuite/test_simple_3.xml
-at_setup_line='DMRTest.at:213'
-at_desc="parse dmr-testsuite/test_simple_3.xml"
-$at_quiet $as_echo_n " 3: $at_desc "
+at_fn_group_banner 3 'DMRTest.at:213' \
+ "parse dmr-testsuite/test_simple_3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "3. DMRTest.at:213: testing ..."
+ $as_echo "3. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2354,111 +2425,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:213: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:213 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:213: mv stdout \$baseline.tmp"
-echo DMRTest.at:213 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:213"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:213: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:213 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:213: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:213 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:213"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_3
#AT_START_4
-# 4. DMRTest.at:215: parse dmr-testsuite/test_simple_3_error_1.xml
-at_setup_line='DMRTest.at:215'
-at_desc="parse dmr-testsuite/test_simple_3_error_1.xml"
-$at_quiet $as_echo_n " 4: $at_desc "
+at_fn_group_banner 4 'DMRTest.at:215' \
+ "parse dmr-testsuite/test_simple_3_error_1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "4. DMRTest.at:215: testing ..."
+ $as_echo "4. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2466,111 +2505,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_3_error_1.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:215: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:215 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:215: mv stdout \$baseline.tmp"
-echo DMRTest.at:215 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:215"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:215: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:215 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:215: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:215 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:215"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_4
#AT_START_5
-# 5. DMRTest.at:216: parse dmr-testsuite/test_simple_3_error_2.xml
-at_setup_line='DMRTest.at:216'
-at_desc="parse dmr-testsuite/test_simple_3_error_2.xml"
-$at_quiet $as_echo_n " 5: $at_desc "
+at_fn_group_banner 5 'DMRTest.at:216' \
+ "parse dmr-testsuite/test_simple_3_error_2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "5. DMRTest.at:216: testing ..."
+ $as_echo "5. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2578,111 +2585,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_3_error_2.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:216: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:216 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:216: mv stdout \$baseline.tmp"
-echo DMRTest.at:216 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:216"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:216: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:216 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:216: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:216 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:216"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_5
#AT_START_6
-# 6. DMRTest.at:217: parse dmr-testsuite/test_simple_3_error_3.xml
-at_setup_line='DMRTest.at:217'
-at_desc="parse dmr-testsuite/test_simple_3_error_3.xml"
-$at_quiet $as_echo_n " 6: $at_desc "
+at_fn_group_banner 6 'DMRTest.at:217' \
+ "parse dmr-testsuite/test_simple_3_error_3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "6. DMRTest.at:217: testing ..."
+ $as_echo "6. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2690,111 +2665,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_3_error_3.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:217: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:217 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:217: mv stdout \$baseline.tmp"
-echo DMRTest.at:217 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:217"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:217: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:217 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:217: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:217 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:217"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_6
#AT_START_7
-# 7. DMRTest.at:219: parse dmr-testsuite/test_simple_4.xml
-at_setup_line='DMRTest.at:219'
-at_desc="parse dmr-testsuite/test_simple_4.xml"
-$at_quiet $as_echo_n " 7: $at_desc "
+at_fn_group_banner 7 'DMRTest.at:219' \
+ "parse dmr-testsuite/test_simple_4.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "7. DMRTest.at:219: testing ..."
+ $as_echo "7. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2802,111 +2745,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:219: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:219 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:219: mv stdout \$baseline.tmp"
-echo DMRTest.at:219 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:219"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:219: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:219 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:219: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:219 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:219"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_7
#AT_START_8
-# 8. DMRTest.at:220: parse dmr-testsuite/test_simple_5.xml
-at_setup_line='DMRTest.at:220'
-at_desc="parse dmr-testsuite/test_simple_5.xml"
-$at_quiet $as_echo_n " 8: $at_desc "
+at_fn_group_banner 8 'DMRTest.at:220' \
+ "parse dmr-testsuite/test_simple_5.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "8. DMRTest.at:220: testing ..."
+ $as_echo "8. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2914,111 +2825,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:220: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:220 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:220: mv stdout \$baseline.tmp"
-echo DMRTest.at:220 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:220"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:220: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:220 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:220: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:220 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:220"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_8
#AT_START_9
-# 9. DMRTest.at:221: parse dmr-testsuite/test_simple_6.xml
-at_setup_line='DMRTest.at:221'
-at_desc="parse dmr-testsuite/test_simple_6.xml"
-$at_quiet $as_echo_n " 9: $at_desc "
+at_fn_group_banner 9 'DMRTest.at:221' \
+ "parse dmr-testsuite/test_simple_6.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "9. DMRTest.at:221: testing ..."
+ $as_echo "9. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3026,111 +2905,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:221: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:221 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:221: mv stdout \$baseline.tmp"
-echo DMRTest.at:221 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:221"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:221: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:221 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:221: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:221 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:221"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_9
#AT_START_10
-# 10. DMRTest.at:222: parse dmr-testsuite/test_simple_7.xml
-at_setup_line='DMRTest.at:222'
-at_desc="parse dmr-testsuite/test_simple_7.xml"
-$at_quiet $as_echo_n " 10: $at_desc "
+at_fn_group_banner 10 'DMRTest.at:222' \
+ "parse dmr-testsuite/test_simple_7.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "10. DMRTest.at:222: testing ..."
+ $as_echo "10. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3138,111 +2985,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:222: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:222 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:222: mv stdout \$baseline.tmp"
-echo DMRTest.at:222 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:222"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:222: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:222 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:222: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:222 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
-
-$at_failed && at_func_log_failure
+ { 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"
+( $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_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_10
#AT_START_11
-# 11. DMRTest.at:223: parse dmr-testsuite/test_simple_8.xml
-at_setup_line='DMRTest.at:223'
-at_desc="parse dmr-testsuite/test_simple_8.xml"
-$at_quiet $as_echo_n " 11: $at_desc "
+at_fn_group_banner 11 'DMRTest.at:223' \
+ "parse dmr-testsuite/test_simple_8.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "11. DMRTest.at:223: testing ..."
+ $as_echo "11. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3250,111 +3065,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:223: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:223 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:223: mv stdout \$baseline.tmp"
-echo DMRTest.at:223 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:223"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:223: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:223 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:223: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:223 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:223"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_11
#AT_START_12
-# 12. DMRTest.at:224: parse dmr-testsuite/test_simple_9.xml
-at_setup_line='DMRTest.at:224'
-at_desc="parse dmr-testsuite/test_simple_9.xml"
-$at_quiet $as_echo_n " 12: $at_desc "
+at_fn_group_banner 12 'DMRTest.at:224' \
+ "parse dmr-testsuite/test_simple_9.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "12. DMRTest.at:224: testing ..."
+ $as_echo "12. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3362,111 +3145,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:224: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:224 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:224: mv stdout \$baseline.tmp"
-echo DMRTest.at:224 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:224"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:224: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:224 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:224: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:224 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:224"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_12
#AT_START_13
-# 13. DMRTest.at:225: parse dmr-testsuite/test_simple_9.1.xml
-at_setup_line='DMRTest.at:225'
-at_desc="parse dmr-testsuite/test_simple_9.1.xml"
-$at_quiet $as_echo_n " 13: $at_desc "
+at_fn_group_banner 13 'DMRTest.at:225' \
+ "parse dmr-testsuite/test_simple_9.1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "13. DMRTest.at:225: testing ..."
+ $as_echo "13. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3474,111 +3225,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:225: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:225 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:225: mv stdout \$baseline.tmp"
-echo DMRTest.at:225 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:225"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:225: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:225 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:225: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:225 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:225"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_13
#AT_START_14
-# 14. DMRTest.at:226: parse dmr-testsuite/test_simple_10.xml
-at_setup_line='DMRTest.at:226'
-at_desc="parse dmr-testsuite/test_simple_10.xml"
-$at_quiet $as_echo_n " 14: $at_desc "
+at_fn_group_banner 14 'DMRTest.at:226' \
+ "parse dmr-testsuite/test_simple_10.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "14. DMRTest.at:226: testing ..."
+ $as_echo "14. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3586,111 +3305,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:226: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:226 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:226: mv stdout \$baseline.tmp"
-echo DMRTest.at:226 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:226"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:226: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:226 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:226: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:226 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:226"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_14
#AT_START_15
-# 15. DMRTest.at:228: parse dmr-testsuite/test_array_1.xml
-at_setup_line='DMRTest.at:228'
-at_desc="parse dmr-testsuite/test_array_1.xml"
-$at_quiet $as_echo_n " 15: $at_desc "
+at_fn_group_banner 15 'DMRTest.at:228' \
+ "parse dmr-testsuite/test_array_1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "15. DMRTest.at:228: testing ..."
+ $as_echo "15. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3698,111 +3385,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_1.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:228: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:228 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:228: mv stdout \$baseline.tmp"
-echo DMRTest.at:228 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:228"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:228: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:228 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:228: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:228 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:228"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_15
#AT_START_16
-# 16. DMRTest.at:229: parse dmr-testsuite/test_array_2.xml
-at_setup_line='DMRTest.at:229'
-at_desc="parse dmr-testsuite/test_array_2.xml"
-$at_quiet $as_echo_n " 16: $at_desc "
+at_fn_group_banner 16 'DMRTest.at:229' \
+ "parse dmr-testsuite/test_array_2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "16. DMRTest.at:229: testing ..."
+ $as_echo "16. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3810,111 +3465,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_2.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:229: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:229 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:229: mv stdout \$baseline.tmp"
-echo DMRTest.at:229 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:229"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:229: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:229 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:229: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:229 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:229"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_16
#AT_START_17
-# 17. DMRTest.at:230: parse dmr-testsuite/test_array_3.xml
-at_setup_line='DMRTest.at:230'
-at_desc="parse dmr-testsuite/test_array_3.xml"
-$at_quiet $as_echo_n " 17: $at_desc "
+at_fn_group_banner 17 'DMRTest.at:230' \
+ "parse dmr-testsuite/test_array_3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "17. DMRTest.at:230: testing ..."
+ $as_echo "17. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3922,111 +3545,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_3.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:230 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:230: mv stdout \$baseline.tmp"
-echo DMRTest.at:230 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:230"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:230 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:230: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:230 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_17
#AT_START_18
-# 18. DMRTest.at:231: parse dmr-testsuite/test_array_4.xml
-at_setup_line='DMRTest.at:231'
-at_desc="parse dmr-testsuite/test_array_4.xml"
-$at_quiet $as_echo_n " 18: $at_desc "
+at_fn_group_banner 18 'DMRTest.at:231' \
+ "parse dmr-testsuite/test_array_4.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "18. DMRTest.at:231: testing ..."
+ $as_echo "18. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4034,111 +3625,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:231 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:231: mv stdout \$baseline.tmp"
-echo DMRTest.at:231 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:231"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:231 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:231: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:231 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_18
#AT_START_19
-# 19. DMRTest.at:232: parse dmr-testsuite/test_array_5.xml
-at_setup_line='DMRTest.at:232'
-at_desc="parse dmr-testsuite/test_array_5.xml"
-$at_quiet $as_echo_n " 19: $at_desc "
+at_fn_group_banner 19 'DMRTest.at:232' \
+ "parse dmr-testsuite/test_array_5.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "19. DMRTest.at:232: testing ..."
+ $as_echo "19. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4146,111 +3705,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_5.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:232 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:232: mv stdout \$baseline.tmp"
-echo DMRTest.at:232 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:232"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:232 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:232: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:232 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_19
#AT_START_20
-# 20. DMRTest.at:233: parse dmr-testsuite/test_array_6.xml
-at_setup_line='DMRTest.at:233'
-at_desc="parse dmr-testsuite/test_array_6.xml"
-$at_quiet $as_echo_n " 20: $at_desc "
+at_fn_group_banner 20 'DMRTest.at:233' \
+ "parse dmr-testsuite/test_array_6.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "20. DMRTest.at:233: testing ..."
+ $as_echo "20. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4258,111 +3785,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:233: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:233 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:233: mv stdout \$baseline.tmp"
-echo DMRTest.at:233 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:233"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:233: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:233 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:233: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:233 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:233"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_20
#AT_START_21
-# 21. DMRTest.at:234: parse dmr-testsuite/test_array_7.xml
-at_setup_line='DMRTest.at:234'
-at_desc="parse dmr-testsuite/test_array_7.xml"
-$at_quiet $as_echo_n " 21: $at_desc "
+at_fn_group_banner 21 'DMRTest.at:234' \
+ "parse dmr-testsuite/test_array_7.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "21. DMRTest.at:234: testing ..."
+ $as_echo "21. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4370,111 +3865,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:234 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:234: mv stdout \$baseline.tmp"
-echo DMRTest.at:234 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:234"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:234 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:234: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:234 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_21
#AT_START_22
-# 22. DMRTest.at:235: parse dmr-testsuite/test_array_8.xml
-at_setup_line='DMRTest.at:235'
-at_desc="parse dmr-testsuite/test_array_8.xml"
-$at_quiet $as_echo_n " 22: $at_desc "
+at_fn_group_banner 22 'DMRTest.at:235' \
+ "parse dmr-testsuite/test_array_8.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "22. DMRTest.at:235: testing ..."
+ $as_echo "22. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4482,111 +3945,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_8.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:235 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:235: mv stdout \$baseline.tmp"
-echo DMRTest.at:235 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:235"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:235 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:235: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:235 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_22
#AT_START_23
-# 23. DMRTest.at:236: parse dmr-testsuite/test_array_10.xml
-at_setup_line='DMRTest.at:236'
-at_desc="parse dmr-testsuite/test_array_10.xml"
-$at_quiet $as_echo_n " 23: $at_desc "
+at_fn_group_banner 23 'DMRTest.at:236' \
+ "parse dmr-testsuite/test_array_10.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "23. DMRTest.at:236: testing ..."
+ $as_echo "23. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4594,111 +4025,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_10.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:236 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:236: mv stdout \$baseline.tmp"
-echo DMRTest.at:236 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:236"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:236 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:236: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:236 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_23
#AT_START_24
-# 24. DMRTest.at:237: parse dmr-testsuite/test_array_11.xml
-at_setup_line='DMRTest.at:237'
-at_desc="parse dmr-testsuite/test_array_11.xml"
-$at_quiet $as_echo_n " 24: $at_desc "
+at_fn_group_banner 24 'DMRTest.at:237' \
+ "parse dmr-testsuite/test_array_11.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "24. DMRTest.at:237: testing ..."
+ $as_echo "24. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4706,111 +4105,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_11.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:237: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:237 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:237: mv stdout \$baseline.tmp"
-echo DMRTest.at:237 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:237"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:237: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:237 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:237: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:237 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:237"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_24
#AT_START_25
-# 25. DMRTest.at:239: parse dmr-testsuite/ignore_foreign_xml_1.xml
-at_setup_line='DMRTest.at:239'
-at_desc="parse dmr-testsuite/ignore_foreign_xml_1.xml"
-$at_quiet $as_echo_n " 25: $at_desc "
+at_fn_group_banner 25 'DMRTest.at:239' \
+ "parse dmr-testsuite/ignore_foreign_xml_1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "25. DMRTest.at:239: testing ..."
+ $as_echo "25. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4818,111 +4185,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/ignore_foreign_xml_1.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:239: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:239 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:239"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:239: mv stdout \$baseline.tmp"
-echo DMRTest.at:239 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:239"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:239"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:239: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:239 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:239"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:239: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:239 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:239"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:239"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_25
#AT_START_26
-# 26. DMRTest.at:240: parse dmr-testsuite/ignore_foreign_xml_2.xml
-at_setup_line='DMRTest.at:240'
-at_desc="parse dmr-testsuite/ignore_foreign_xml_2.xml"
-$at_quiet $as_echo_n " 26: $at_desc "
+at_fn_group_banner 26 'DMRTest.at:240' \
+ "parse dmr-testsuite/ignore_foreign_xml_2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "26. DMRTest.at:240: testing ..."
+ $as_echo "26. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4930,111 +4265,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/ignore_foreign_xml_2.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:240: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:240 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:240"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:240: mv stdout \$baseline.tmp"
-echo DMRTest.at:240 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:240"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:240"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:240: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:240 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:240"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:240: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:240 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:240"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:240"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_26
#AT_START_27
-# 27. DMRTest.at:241: parse dmr-testsuite/ignore_foreign_xml_3.xml
-at_setup_line='DMRTest.at:241'
-at_desc="parse dmr-testsuite/ignore_foreign_xml_3.xml"
-$at_quiet $as_echo_n " 27: $at_desc "
+at_fn_group_banner 27 'DMRTest.at:241' \
+ "parse dmr-testsuite/ignore_foreign_xml_3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "27. DMRTest.at:241: testing ..."
+ $as_echo "27. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5042,111 +4345,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/ignore_foreign_xml_3.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:241: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:241 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+at_fn_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:241"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:241: mv stdout \$baseline.tmp"
-echo DMRTest.at:241 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:241"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:241"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:241: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:241 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:241"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:241: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:241 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:241"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:241"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_27
#AT_START_28
-# 28. DMRTest.at:251: trans test_simple_1.xml
-at_setup_line='DMRTest.at:251'
-at_desc="trans test_simple_1.xml"
-$at_quiet $as_echo_n " 28: $at_desc "
+at_fn_group_banner 28 'DMRTest.at:251' \
+ "trans test_simple_1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "28. DMRTest.at:251: testing ..."
+ $as_echo "28. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5159,89 +4430,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_1.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:251 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:251"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:251: mv stdout \$baseline.tmp"
-echo DMRTest.at:251 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:251"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:251 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:251"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:251: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:251 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5249,22 +4492,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_28
#AT_START_29
-# 29. DMRTest.at:252: trans test_simple_2.xml
-at_setup_line='DMRTest.at:252'
-at_desc="trans test_simple_2.xml"
-$at_quiet $as_echo_n " 29: $at_desc "
+at_fn_group_banner 29 'DMRTest.at:252' \
+ "trans test_simple_2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "29. DMRTest.at:252: testing ..."
+ $as_echo "29. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5277,89 +4516,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_2.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:252 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:252"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:252: mv stdout \$baseline.tmp"
-echo DMRTest.at:252 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:252"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:252 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:252"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:252: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:252 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5367,22 +4578,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_29
#AT_START_30
-# 30. DMRTest.at:253: trans test_simple_3.xml
-at_setup_line='DMRTest.at:253'
-at_desc="trans test_simple_3.xml"
-$at_quiet $as_echo_n " 30: $at_desc "
+at_fn_group_banner 30 'DMRTest.at:253' \
+ "trans test_simple_3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "30. DMRTest.at:253: testing ..."
+ $as_echo "30. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5395,89 +4602,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_3.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:253 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:253"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:253: mv stdout \$baseline.tmp"
-echo DMRTest.at:253 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:253"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:253 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:253"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:253: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:253 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5485,22 +4664,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_30
#AT_START_31
-# 31. DMRTest.at:254: trans test_simple_4.xml
-at_setup_line='DMRTest.at:254'
-at_desc="trans test_simple_4.xml"
-$at_quiet $as_echo_n " 31: $at_desc "
+at_fn_group_banner 31 'DMRTest.at:254' \
+ "trans test_simple_4.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "31. DMRTest.at:254: testing ..."
+ $as_echo "31. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5513,89 +4688,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_4.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:254 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:254"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:254: mv stdout \$baseline.tmp"
-echo DMRTest.at:254 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:254"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:254 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:254"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:254: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:254 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5603,22 +4750,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_31
#AT_START_32
-# 32. DMRTest.at:255: trans test_simple_5.xml
-at_setup_line='DMRTest.at:255'
-at_desc="trans test_simple_5.xml"
-$at_quiet $as_echo_n " 32: $at_desc "
+at_fn_group_banner 32 'DMRTest.at:255' \
+ "trans test_simple_5.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "32. DMRTest.at:255: testing ..."
+ $as_echo "32. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5631,89 +4774,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_5.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:255 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:255"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:255: mv stdout \$baseline.tmp"
-echo DMRTest.at:255 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:255"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:255 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:255"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:255: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:255 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5721,22 +4836,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_32
#AT_START_33
-# 33. DMRTest.at:256: trans test_simple_6.xml
-at_setup_line='DMRTest.at:256'
-at_desc="trans test_simple_6.xml"
-$at_quiet $as_echo_n " 33: $at_desc "
+at_fn_group_banner 33 'DMRTest.at:256' \
+ "trans test_simple_6.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "33. DMRTest.at:256: testing ..."
+ $as_echo "33. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5749,89 +4860,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:256 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:256"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:256: mv stdout \$baseline.tmp"
-echo DMRTest.at:256 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:256"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:256 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:256"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:256: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:256 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5839,22 +4922,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_33
#AT_START_34
-# 34. DMRTest.at:257: trans test_simple_7.xml
-at_setup_line='DMRTest.at:257'
-at_desc="trans test_simple_7.xml"
-$at_quiet $as_echo_n " 34: $at_desc "
+at_fn_group_banner 34 'DMRTest.at:257' \
+ "trans test_simple_7.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "34. DMRTest.at:257: testing ..."
+ $as_echo "34. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5867,89 +4946,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:257: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:257 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:257"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:257: mv stdout \$baseline.tmp"
-echo DMRTest.at:257 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:257"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:257: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:257 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:257"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:257: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:257 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:257"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5957,22 +5008,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_34
#AT_START_35
-# 35. DMRTest.at:258: trans test_simple_8.xml
-at_setup_line='DMRTest.at:258'
-at_desc="trans test_simple_8.xml"
-$at_quiet $as_echo_n " 35: $at_desc "
+at_fn_group_banner 35 'DMRTest.at:258' \
+ "trans test_simple_8.xml" " "
at_xfail=no
test "xfail" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "35. DMRTest.at:258: testing ..."
+ $as_echo "35. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5985,89 +5032,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:258: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:258 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:258"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:258: mv stdout \$baseline.tmp"
-echo DMRTest.at:258 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:258"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:258: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:258 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:258"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:258: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:258 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:258"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6075,22 +5094,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_35
#AT_START_36
-# 36. DMRTest.at:259: trans test_simple_9.xml
-at_setup_line='DMRTest.at:259'
-at_desc="trans test_simple_9.xml"
-$at_quiet $as_echo_n " 36: $at_desc "
+at_fn_group_banner 36 'DMRTest.at:259' \
+ "trans test_simple_9.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "36. DMRTest.at:259: testing ..."
+ $as_echo "36. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6103,89 +5118,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:259 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:259"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:259: mv stdout \$baseline.tmp"
-echo DMRTest.at:259 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:259"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:259 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:259"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:259: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:259 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6193,22 +5180,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_36
#AT_START_37
-# 37. DMRTest.at:260: trans test_simple_9.1.xml
-at_setup_line='DMRTest.at:260'
-at_desc="trans test_simple_9.1.xml"
-$at_quiet $as_echo_n " 37: $at_desc "
+at_fn_group_banner 37 'DMRTest.at:260' \
+ "trans test_simple_9.1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "37. DMRTest.at:260: testing ..."
+ $as_echo "37. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6221,89 +5204,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.1.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:260 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:260"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:260: mv stdout \$baseline.tmp"
-echo DMRTest.at:260 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:260"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:260 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:260"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:260: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:260 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6311,22 +5266,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_37
#AT_START_38
-# 38. DMRTest.at:261: trans test_simple_10.xml
-at_setup_line='DMRTest.at:261'
-at_desc="trans test_simple_10.xml"
-$at_quiet $as_echo_n " 38: $at_desc "
+at_fn_group_banner 38 'DMRTest.at:261' \
+ "trans test_simple_10.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "38. DMRTest.at:261: testing ..."
+ $as_echo "38. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6339,89 +5290,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_10.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:261: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:261 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:261"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:261: mv stdout \$baseline.tmp"
-echo DMRTest.at:261 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:261"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:261: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:261 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:261"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:261: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:261 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:261"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6429,22 +5352,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_38
#AT_START_39
-# 39. DMRTest.at:263: trans test_array_1.xml
-at_setup_line='DMRTest.at:263'
-at_desc="trans test_array_1.xml"
-$at_quiet $as_echo_n " 39: $at_desc "
+at_fn_group_banner 39 'DMRTest.at:263' \
+ "trans test_array_1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "39. DMRTest.at:263: testing ..."
+ $as_echo "39. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6457,89 +5376,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:263: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:263 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:263"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:263: mv stdout \$baseline.tmp"
-echo DMRTest.at:263 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:263"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:263: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:263 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:263"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:263: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:263 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:263"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6547,22 +5438,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_39
#AT_START_40
-# 40. DMRTest.at:264: trans test_array_2.xml
-at_setup_line='DMRTest.at:264'
-at_desc="trans test_array_2.xml"
-$at_quiet $as_echo_n " 40: $at_desc "
+at_fn_group_banner 40 'DMRTest.at:264' \
+ "trans test_array_2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "40. DMRTest.at:264: testing ..."
+ $as_echo "40. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6575,89 +5462,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_2.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:264: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:264 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:264"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:264: mv stdout \$baseline.tmp"
-echo DMRTest.at:264 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:264"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:264: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:264 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:264"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:264: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:264 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:264"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6665,22 +5524,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_40
#AT_START_41
-# 41. DMRTest.at:265: trans test_array_3.xml
-at_setup_line='DMRTest.at:265'
-at_desc="trans test_array_3.xml"
-$at_quiet $as_echo_n " 41: $at_desc "
+at_fn_group_banner 41 'DMRTest.at:265' \
+ "trans test_array_3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "41. DMRTest.at:265: testing ..."
+ $as_echo "41. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6693,89 +5548,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_3.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:265: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:265 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:265"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:265: mv stdout \$baseline.tmp"
-echo DMRTest.at:265 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:265"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:265: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:265 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:265"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:265: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:265 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:265"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6783,22 +5610,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_41
#AT_START_42
-# 42. DMRTest.at:266: trans test_array_4.xml
-at_setup_line='DMRTest.at:266'
-at_desc="trans test_array_4.xml"
-$at_quiet $as_echo_n " 42: $at_desc "
+at_fn_group_banner 42 'DMRTest.at:266' \
+ "trans test_array_4.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "42. DMRTest.at:266: testing ..."
+ $as_echo "42. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6811,89 +5634,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:266: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:266 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:266"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:266: mv stdout \$baseline.tmp"
-echo DMRTest.at:266 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:266"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:266: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:266 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:266"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:266: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:266 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:266"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6901,22 +5696,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_42
#AT_START_43
-# 43. DMRTest.at:267: trans test_array_5.xml
-at_setup_line='DMRTest.at:267'
-at_desc="trans test_array_5.xml"
-$at_quiet $as_echo_n " 43: $at_desc "
+at_fn_group_banner 43 'DMRTest.at:267' \
+ "trans test_array_5.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "43. DMRTest.at:267: testing ..."
+ $as_echo "43. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6929,89 +5720,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_5.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:267: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:267 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:267"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:267: mv stdout \$baseline.tmp"
-echo DMRTest.at:267 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:267"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:267: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:267 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:267"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:267: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:267 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:267"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7019,22 +5782,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_43
#AT_START_44
-# 44. DMRTest.at:268: trans test_array_6.xml
-at_setup_line='DMRTest.at:268'
-at_desc="trans test_array_6.xml"
-$at_quiet $as_echo_n " 44: $at_desc "
+at_fn_group_banner 44 'DMRTest.at:268' \
+ "trans test_array_6.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "44. DMRTest.at:268: testing ..."
+ $as_echo "44. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7047,89 +5806,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:268: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:268 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:268"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:268: mv stdout \$baseline.tmp"
-echo DMRTest.at:268 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:268"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:268: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:268 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:268"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:268: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:268 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:268"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7137,22 +5868,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_44
#AT_START_45
-# 45. DMRTest.at:269: trans test_array_7.xml
-at_setup_line='DMRTest.at:269'
-at_desc="trans test_array_7.xml"
-$at_quiet $as_echo_n " 45: $at_desc "
+at_fn_group_banner 45 'DMRTest.at:269' \
+ "trans test_array_7.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "45. DMRTest.at:269: testing ..."
+ $as_echo "45. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7165,89 +5892,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:269: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:269 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:269"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:269: mv stdout \$baseline.tmp"
-echo DMRTest.at:269 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:269"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:269: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:269 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:269"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:269: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:269 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:269"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:269"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7255,22 +5954,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_45
#AT_START_46
-# 46. DMRTest.at:270: trans test_array_8.xml
-at_setup_line='DMRTest.at:270'
-at_desc="trans test_array_8.xml"
-$at_quiet $as_echo_n " 46: $at_desc "
+at_fn_group_banner 46 'DMRTest.at:270' \
+ "trans test_array_8.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "46. DMRTest.at:270: testing ..."
+ $as_echo "46. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7283,89 +5978,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:270 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:270: mv stdout \$baseline.tmp"
-echo DMRTest.at:270 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:270"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:270 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:270: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:270 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7373,22 +6040,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_46
#AT_START_47
-# 47. DMRTest.at:271: trans test_array_10.xml
-at_setup_line='DMRTest.at:271'
-at_desc="trans test_array_10.xml"
-$at_quiet $as_echo_n " 47: $at_desc "
+at_fn_group_banner 47 'DMRTest.at:271' \
+ "trans test_array_10.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "47. DMRTest.at:271: testing ..."
+ $as_echo "47. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7401,89 +6064,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_10.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_10.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:271 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:271: mv stdout \$baseline.tmp"
-echo DMRTest.at:271 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:271"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:271 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:271: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:271 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7491,22 +6126,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_47
#AT_START_48
-# 48. DMRTest.at:272: trans test_array_11.xml
-at_setup_line='DMRTest.at:272'
-at_desc="trans test_array_11.xml"
-$at_quiet $as_echo_n " 48: $at_desc "
+at_fn_group_banner 48 'DMRTest.at:272' \
+ "trans test_array_11.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "48. DMRTest.at:272: testing ..."
+ $as_echo "48. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7519,89 +6150,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_11.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_11.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:272 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:272: mv stdout \$baseline.tmp"
-echo DMRTest.at:272 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:272"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:272 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:272: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:272 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7609,22 +6212,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_48
#AT_START_49
-# 49. DMRTest.at:274: intern test_simple_1.xml
-at_setup_line='DMRTest.at:274'
-at_desc="intern test_simple_1.xml"
-$at_quiet $as_echo_n " 49: $at_desc "
+at_fn_group_banner 49 'DMRTest.at:274' \
+ "intern test_simple_1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "49. DMRTest.at:274: testing ..."
+ $as_echo "49. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7636,89 +6235,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_1.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:274 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:274"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:274: mv stdout \$baseline.tmp"
-echo DMRTest.at:274 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:274"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:274 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:274"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:274: diff -b -B \$baseline stdout"
-echo DMRTest.at:274 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:274"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7726,22 +6297,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_49
#AT_START_50
-# 50. DMRTest.at:275: intern test_simple_2.xml
-at_setup_line='DMRTest.at:275'
-at_desc="intern test_simple_2.xml"
-$at_quiet $as_echo_n " 50: $at_desc "
+at_fn_group_banner 50 'DMRTest.at:275' \
+ "intern test_simple_2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "50. DMRTest.at:275: testing ..."
+ $as_echo "50. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7753,89 +6320,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_2.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:275 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:275"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:275: mv stdout \$baseline.tmp"
-echo DMRTest.at:275 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:275"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:275 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:275"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:275: diff -b -B \$baseline stdout"
-echo DMRTest.at:275 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:275"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7843,22 +6382,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_50
#AT_START_51
-# 51. DMRTest.at:276: intern test_simple_3.xml
-at_setup_line='DMRTest.at:276'
-at_desc="intern test_simple_3.xml"
-$at_quiet $as_echo_n " 51: $at_desc "
+at_fn_group_banner 51 'DMRTest.at:276' \
+ "intern test_simple_3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "51. DMRTest.at:276: testing ..."
+ $as_echo "51. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7870,89 +6405,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_3.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:276 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:276"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:276: mv stdout \$baseline.tmp"
-echo DMRTest.at:276 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:276"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:276 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:276"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:276: diff -b -B \$baseline stdout"
-echo DMRTest.at:276 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:276"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7960,22 +6467,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_51
#AT_START_52
-# 52. DMRTest.at:277: intern test_simple_4.xml
-at_setup_line='DMRTest.at:277'
-at_desc="intern test_simple_4.xml"
-$at_quiet $as_echo_n " 52: $at_desc "
+at_fn_group_banner 52 'DMRTest.at:277' \
+ "intern test_simple_4.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "52. DMRTest.at:277: testing ..."
+ $as_echo "52. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7987,89 +6490,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_4.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:277 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:277"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:277: mv stdout \$baseline.tmp"
-echo DMRTest.at:277 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:277"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:277 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:277"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:277: diff -b -B \$baseline stdout"
-echo DMRTest.at:277 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:277"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8077,22 +6552,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_52
#AT_START_53
-# 53. DMRTest.at:278: intern test_simple_5.xml
-at_setup_line='DMRTest.at:278'
-at_desc="intern test_simple_5.xml"
-$at_quiet $as_echo_n " 53: $at_desc "
+at_fn_group_banner 53 'DMRTest.at:278' \
+ "intern test_simple_5.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "53. DMRTest.at:278: testing ..."
+ $as_echo "53. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8104,89 +6575,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_5.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:278 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:278"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:278: mv stdout \$baseline.tmp"
-echo DMRTest.at:278 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:278"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:278 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:278"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:278: diff -b -B \$baseline stdout"
-echo DMRTest.at:278 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:278"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8194,22 +6637,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_53
#AT_START_54
-# 54. DMRTest.at:279: intern test_simple_6.xml
-at_setup_line='DMRTest.at:279'
-at_desc="intern test_simple_6.xml"
-$at_quiet $as_echo_n " 54: $at_desc "
+at_fn_group_banner 54 'DMRTest.at:279' \
+ "intern test_simple_6.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "54. DMRTest.at:279: testing ..."
+ $as_echo "54. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8221,89 +6660,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:279 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:279"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:279: mv stdout \$baseline.tmp"
-echo DMRTest.at:279 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:279"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:279 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:279"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:279: diff -b -B \$baseline stdout"
-echo DMRTest.at:279 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:279"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8311,22 +6722,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_54
#AT_START_55
-# 55. DMRTest.at:280: intern test_simple_7.xml
-at_setup_line='DMRTest.at:280'
-at_desc="intern test_simple_7.xml"
-$at_quiet $as_echo_n " 55: $at_desc "
+at_fn_group_banner 55 'DMRTest.at:280' \
+ "intern test_simple_7.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "55. DMRTest.at:280: testing ..."
+ $as_echo "55. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8338,89 +6745,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:280 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:280"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:280: mv stdout \$baseline.tmp"
-echo DMRTest.at:280 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:280"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:280 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:280"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:280: diff -b -B \$baseline stdout"
-echo DMRTest.at:280 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:280"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8428,22 +6807,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_55
#AT_START_56
-# 56. DMRTest.at:281: intern test_simple_8.xml
-at_setup_line='DMRTest.at:281'
-at_desc="intern test_simple_8.xml"
-$at_quiet $as_echo_n " 56: $at_desc "
+at_fn_group_banner 56 'DMRTest.at:281' \
+ "intern test_simple_8.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "56. DMRTest.at:281: testing ..."
+ $as_echo "56. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8455,89 +6830,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:281: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:281 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:281"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:281: mv stdout \$baseline.tmp"
-echo DMRTest.at:281 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:281"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:281: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:281 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:281"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:281: diff -b -B \$baseline stdout"
-echo DMRTest.at:281 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:281"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:281"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8545,22 +6892,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_56
#AT_START_57
-# 57. DMRTest.at:282: intern test_simple_9.xml
-at_setup_line='DMRTest.at:282'
-at_desc="intern test_simple_9.xml"
-$at_quiet $as_echo_n " 57: $at_desc "
+at_fn_group_banner 57 'DMRTest.at:282' \
+ "intern test_simple_9.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "57. DMRTest.at:282: testing ..."
+ $as_echo "57. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8572,89 +6915,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:282 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:282"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:282: mv stdout \$baseline.tmp"
-echo DMRTest.at:282 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:282"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:282 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:282"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:282: diff -b -B \$baseline stdout"
-echo DMRTest.at:282 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:282"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8662,22 +6977,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_57
#AT_START_58
-# 58. DMRTest.at:283: intern test_simple_9.1.xml
-at_setup_line='DMRTest.at:283'
-at_desc="intern test_simple_9.1.xml"
-$at_quiet $as_echo_n " 58: $at_desc "
+at_fn_group_banner 58 'DMRTest.at:283' \
+ "intern test_simple_9.1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "58. DMRTest.at:283: testing ..."
+ $as_echo "58. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8689,89 +7000,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.1.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:283 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:283"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:283: mv stdout \$baseline.tmp"
-echo DMRTest.at:283 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:283"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:283 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:283"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:283: diff -b -B \$baseline stdout"
-echo DMRTest.at:283 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:283"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8779,22 +7062,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_58
#AT_START_59
-# 59. DMRTest.at:284: intern test_simple_10.xml
-at_setup_line='DMRTest.at:284'
-at_desc="intern test_simple_10.xml"
-$at_quiet $as_echo_n " 59: $at_desc "
+at_fn_group_banner 59 'DMRTest.at:284' \
+ "intern test_simple_10.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "59. DMRTest.at:284: testing ..."
+ $as_echo "59. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8806,89 +7085,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_10.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:284 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:284"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:284: mv stdout \$baseline.tmp"
-echo DMRTest.at:284 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:284"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:284 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:284"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:284: diff -b -B \$baseline stdout"
-echo DMRTest.at:284 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:284"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8896,22 +7147,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_59
#AT_START_60
-# 60. DMRTest.at:286: intern test_array_1.xml
-at_setup_line='DMRTest.at:286'
-at_desc="intern test_array_1.xml"
-$at_quiet $as_echo_n " 60: $at_desc "
+at_fn_group_banner 60 'DMRTest.at:286' \
+ "intern test_array_1.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "60. DMRTest.at:286: testing ..."
+ $as_echo "60. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8923,89 +7170,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:286 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:286"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:286: mv stdout \$baseline.tmp"
-echo DMRTest.at:286 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:286"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:286 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:286"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:286: diff -b -B \$baseline stdout"
-echo DMRTest.at:286 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:286"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9013,22 +7232,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_60
#AT_START_61
-# 61. DMRTest.at:287: intern test_array_2.xml
-at_setup_line='DMRTest.at:287'
-at_desc="intern test_array_2.xml"
-$at_quiet $as_echo_n " 61: $at_desc "
+at_fn_group_banner 61 'DMRTest.at:287' \
+ "intern test_array_2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "61. DMRTest.at:287: testing ..."
+ $as_echo "61. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9040,89 +7255,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_2.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:287 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:287"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:287: mv stdout \$baseline.tmp"
-echo DMRTest.at:287 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:287"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:287 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:287"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:287: diff -b -B \$baseline stdout"
-echo DMRTest.at:287 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:287"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9130,22 +7317,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_61
#AT_START_62
-# 62. DMRTest.at:288: intern test_array_3.xml
-at_setup_line='DMRTest.at:288'
-at_desc="intern test_array_3.xml"
-$at_quiet $as_echo_n " 62: $at_desc "
+at_fn_group_banner 62 'DMRTest.at:288' \
+ "intern test_array_3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "62. DMRTest.at:288: testing ..."
+ $as_echo "62. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9157,89 +7340,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_3.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:288 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:288"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:288: mv stdout \$baseline.tmp"
-echo DMRTest.at:288 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:288"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:288 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:288"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:288: diff -b -B \$baseline stdout"
-echo DMRTest.at:288 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:288"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9247,22 +7402,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_62
#AT_START_63
-# 63. DMRTest.at:289: intern test_array_4.xml
-at_setup_line='DMRTest.at:289'
-at_desc="intern test_array_4.xml"
-$at_quiet $as_echo_n " 63: $at_desc "
+at_fn_group_banner 63 'DMRTest.at:289' \
+ "intern test_array_4.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "63. DMRTest.at:289: testing ..."
+ $as_echo "63. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9274,89 +7425,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:289 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:289"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:289: mv stdout \$baseline.tmp"
-echo DMRTest.at:289 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:289"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:289 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:289"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:289: diff -b -B \$baseline stdout"
-echo DMRTest.at:289 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:289"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9364,22 +7487,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_63
#AT_START_64
-# 64. DMRTest.at:290: intern test_array_5.xml
-at_setup_line='DMRTest.at:290'
-at_desc="intern test_array_5.xml"
-$at_quiet $as_echo_n " 64: $at_desc "
+at_fn_group_banner 64 'DMRTest.at:290' \
+ "intern test_array_5.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "64. DMRTest.at:290: testing ..."
+ $as_echo "64. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9391,89 +7510,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_5.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:290 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:290"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:290: mv stdout \$baseline.tmp"
-echo DMRTest.at:290 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:290"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:290 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:290"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:290: diff -b -B \$baseline stdout"
-echo DMRTest.at:290 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:290"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9481,22 +7572,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_64
#AT_START_65
-# 65. DMRTest.at:291: intern test_array_6.xml
-at_setup_line='DMRTest.at:291'
-at_desc="intern test_array_6.xml"
-$at_quiet $as_echo_n " 65: $at_desc "
+at_fn_group_banner 65 'DMRTest.at:291' \
+ "intern test_array_6.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "65. DMRTest.at:291: testing ..."
+ $as_echo "65. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9508,89 +7595,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:291 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:291"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:291: mv stdout \$baseline.tmp"
-echo DMRTest.at:291 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:291"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:291 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:291"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:291: diff -b -B \$baseline stdout"
-echo DMRTest.at:291 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:291"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9598,22 +7657,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_65
#AT_START_66
-# 66. DMRTest.at:292: intern test_array_7.xml
-at_setup_line='DMRTest.at:292'
-at_desc="intern test_array_7.xml"
-$at_quiet $as_echo_n " 66: $at_desc "
+at_fn_group_banner 66 'DMRTest.at:292' \
+ "intern test_array_7.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "66. DMRTest.at:292: testing ..."
+ $as_echo "66. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9625,89 +7680,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:292: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:292 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:292"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:292: mv stdout \$baseline.tmp"
-echo DMRTest.at:292 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:292"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:292: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:292 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:292"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:292: diff -b -B \$baseline stdout"
-echo DMRTest.at:292 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:292"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:292"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9715,22 +7742,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_66
#AT_START_67
-# 67. DMRTest.at:293: intern test_array_8.xml
-at_setup_line='DMRTest.at:293'
-at_desc="intern test_array_8.xml"
-$at_quiet $as_echo_n " 67: $at_desc "
+at_fn_group_banner 67 'DMRTest.at:293' \
+ "intern test_array_8.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "67. DMRTest.at:293: testing ..."
+ $as_echo "67. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9742,89 +7765,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:293: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:293 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:293: mv stdout \$baseline.tmp"
-echo DMRTest.at:293 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:293"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:293: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:293 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:293: diff -b -B \$baseline stdout"
-echo DMRTest.at:293 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:293"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9832,22 +7827,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_67
#AT_START_68
-# 68. DMRTest.at:294: intern test_array_10.xml
-at_setup_line='DMRTest.at:294'
-at_desc="intern test_array_10.xml"
-$at_quiet $as_echo_n " 68: $at_desc "
+at_fn_group_banner 68 'DMRTest.at:294' \
+ "intern test_array_10.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "68. DMRTest.at:294: testing ..."
+ $as_echo "68. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9859,89 +7850,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_10.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_10.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:294 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:294: mv stdout \$baseline.tmp"
-echo DMRTest.at:294 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:294"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:294 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:294: diff -b -B \$baseline stdout"
-echo DMRTest.at:294 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -9949,22 +7912,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_68
#AT_START_69
-# 69. DMRTest.at:295: intern test_array_11.xml
-at_setup_line='DMRTest.at:295'
-at_desc="intern test_array_11.xml"
-$at_quiet $as_echo_n " 69: $at_desc "
+at_fn_group_banner 69 'DMRTest.at:295' \
+ "intern test_array_11.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "69. DMRTest.at:295: testing ..."
+ $as_echo "69. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9976,89 +7935,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_11.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_11.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:295 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:295: mv stdout \$baseline.tmp"
-echo DMRTest.at:295 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:295"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:295 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:295: diff -b -B \$baseline stdout"
-echo DMRTest.at:295 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10066,22 +7997,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_69
#AT_START_70
-# 70. DMRTest.at:298: parse dmr-testsuite/test_array_9.xml
-at_setup_line='DMRTest.at:298'
-at_desc="parse dmr-testsuite/test_array_9.xml"
-$at_quiet $as_echo_n " 70: $at_desc "
+at_fn_group_banner 70 'DMRTest.at:298' \
+ "parse dmr-testsuite/test_array_9.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "70. DMRTest.at:298: testing ..."
+ $as_echo "70. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10089,111 +8016,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_9.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:298: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:298 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:298"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:298: mv stdout \$baseline.tmp"
-echo DMRTest.at:298 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:298"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:298"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:298: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:298 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:298"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:298"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:298: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:298 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:298"
-
-$at_failed && at_func_log_failure
+ { 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"
+( $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_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_70
#AT_START_71
-# 71. DMRTest.at:299: parse dmr-testsuite/test_array_12.xml
-at_setup_line='DMRTest.at:299'
-at_desc="parse dmr-testsuite/test_array_12.xml"
-$at_quiet $as_echo_n " 71: $at_desc "
+at_fn_group_banner 71 'DMRTest.at:299' \
+ "parse dmr-testsuite/test_array_12.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "71. DMRTest.at:299: testing ..."
+ $as_echo "71. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10201,111 +8096,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_12.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:299: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:299 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:299"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:299: mv stdout \$baseline.tmp"
-echo DMRTest.at:299 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:299"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:299"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:299: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:299 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:299"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:299: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:299 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:299"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:299"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:299"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_71
#AT_START_72
-# 72. DMRTest.at:300: parse dmr-testsuite/test_array_13.xml
-at_setup_line='DMRTest.at:300'
-at_desc="parse dmr-testsuite/test_array_13.xml"
-$at_quiet $as_echo_n " 72: $at_desc "
+at_fn_group_banner 72 'DMRTest.at:300' \
+ "parse dmr-testsuite/test_array_13.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "72. DMRTest.at:300: testing ..."
+ $as_echo "72. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10313,111 +8176,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_13.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:300 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:300: mv stdout \$baseline.tmp"
-echo DMRTest.at:300 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:300"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:300 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:300: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:300 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:300"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_72
#AT_START_73
-# 73. DMRTest.at:301: parse dmr-testsuite/test_array_14.xml
-at_setup_line='DMRTest.at:301'
-at_desc="parse dmr-testsuite/test_array_14.xml"
-$at_quiet $as_echo_n " 73: $at_desc "
+at_fn_group_banner 73 'DMRTest.at:301' \
+ "parse dmr-testsuite/test_array_14.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "73. DMRTest.at:301: testing ..."
+ $as_echo "73. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10425,111 +8256,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_14.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:301 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:301: mv stdout \$baseline.tmp"
-echo DMRTest.at:301 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:301"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:301 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:301: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:301 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:301"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_73
#AT_START_74
-# 74. DMRTest.at:304: parse dmr-testsuite/test_simple_6.2.xml
-at_setup_line='DMRTest.at:304'
-at_desc="parse dmr-testsuite/test_simple_6.2.xml"
-$at_quiet $as_echo_n " 74: $at_desc "
+at_fn_group_banner 74 'DMRTest.at:304' \
+ "parse dmr-testsuite/test_simple_6.2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "74. DMRTest.at:304: testing ..."
+ $as_echo "74. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10537,111 +8336,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:304 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:304: mv stdout \$baseline.tmp"
-echo DMRTest.at:304 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:304"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:304 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:304: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:304 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:304"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_74
#AT_START_75
-# 75. DMRTest.at:305: parse dmr-testsuite/test_simple_6.3.xml
-at_setup_line='DMRTest.at:305'
-at_desc="parse dmr-testsuite/test_simple_6.3.xml"
-$at_quiet $as_echo_n " 75: $at_desc "
+at_fn_group_banner 75 'DMRTest.at:305' \
+ "parse dmr-testsuite/test_simple_6.3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "75. DMRTest.at:305: testing ..."
+ $as_echo "75. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10649,111 +8416,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
baseline=$input.baseline
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:305 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:305: mv stdout \$baseline.tmp"
-echo DMRTest.at:305 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:305"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -p \$input || true"
-echo DMRTest.at:305 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:305: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:305 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:305"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_75
#AT_START_76
-# 76. DMRTest.at:307: trans test_array_9.xml
-at_setup_line='DMRTest.at:307'
-at_desc="trans test_array_9.xml"
-$at_quiet $as_echo_n " 76: $at_desc "
+at_fn_group_banner 76 'DMRTest.at:307' \
+ "trans test_array_9.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "76. DMRTest.at:307: testing ..."
+ $as_echo "76. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10766,89 +8501,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_9.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_9.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:307: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:307 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:307"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:307: mv stdout \$baseline.tmp"
-echo DMRTest.at:307 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:307"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:307: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:307 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:307"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:307: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:307 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:307"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:307"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10856,22 +8563,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_76
#AT_START_77
-# 77. DMRTest.at:308: trans test_array_12.xml
-at_setup_line='DMRTest.at:308'
-at_desc="trans test_array_12.xml"
-$at_quiet $as_echo_n " 77: $at_desc "
+at_fn_group_banner 77 'DMRTest.at:308' \
+ "trans test_array_12.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "77. DMRTest.at:308: testing ..."
+ $as_echo "77. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10884,89 +8587,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_12.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_12.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:308 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:308"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:308: mv stdout \$baseline.tmp"
-echo DMRTest.at:308 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:308"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:308 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:308"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:308: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:308 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:308"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10974,22 +8649,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_77
#AT_START_78
-# 78. DMRTest.at:309: trans test_array_13.xml
-at_setup_line='DMRTest.at:309'
-at_desc="trans test_array_13.xml"
-$at_quiet $as_echo_n " 78: $at_desc "
+at_fn_group_banner 78 'DMRTest.at:309' \
+ "trans test_array_13.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "78. DMRTest.at:309: testing ..."
+ $as_echo "78. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11002,89 +8673,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_13.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_13.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:309 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:309"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:309: mv stdout \$baseline.tmp"
-echo DMRTest.at:309 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:309"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:309 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:309"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:309: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:309 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:309"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11092,22 +8735,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_78
#AT_START_79
-# 79. DMRTest.at:310: trans test_array_14.xml
-at_setup_line='DMRTest.at:310'
-at_desc="trans test_array_14.xml"
-$at_quiet $as_echo_n " 79: $at_desc "
+at_fn_group_banner 79 'DMRTest.at:310' \
+ "trans test_array_14.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "79. DMRTest.at:310: testing ..."
+ $as_echo "79. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11120,89 +8759,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_14.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_14.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:310: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:310 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:310"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:310: mv stdout \$baseline.tmp"
-echo DMRTest.at:310 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:310"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:310: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:310 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:310"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:310: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:310 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:310"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:310"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11210,22 +8821,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_79
#AT_START_80
-# 80. DMRTest.at:312: trans test_simple_6.2.xml
-at_setup_line='DMRTest.at:312'
-at_desc="trans test_simple_6.2.xml"
-$at_quiet $as_echo_n " 80: $at_desc "
+at_fn_group_banner 80 'DMRTest.at:312' \
+ "trans test_simple_6.2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "80. DMRTest.at:312: testing ..."
+ $as_echo "80. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11238,89 +8845,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.2.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:312 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:312"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:312: mv stdout \$baseline.tmp"
-echo DMRTest.at:312 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:312"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:312 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:312"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:312: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:312 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:312"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11328,22 +8907,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_80
#AT_START_81
-# 81. DMRTest.at:313: trans test_simple_6.3.xml
-at_setup_line='DMRTest.at:313'
-at_desc="trans test_simple_6.3.xml"
-$at_quiet $as_echo_n " 81: $at_desc "
+at_fn_group_banner 81 'DMRTest.at:313' \
+ "trans test_simple_6.3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "81. DMRTest.at:313: testing ..."
+ $as_echo "81. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11356,89 +8931,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.3.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input"
-echo DMRTest.at:313 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:313"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:313: mv stdout \$baseline.tmp"
-echo DMRTest.at:313 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:313"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input || true"
-echo DMRTest.at:313 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:313"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:313: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:313 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:313"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11446,22 +8993,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_81
#AT_START_82
-# 82. DMRTest.at:316: trans test_array_9.xml
-at_setup_line='DMRTest.at:316'
-at_desc="trans test_array_9.xml"
-$at_quiet $as_echo_n " 82: $at_desc "
+at_fn_group_banner 82 'DMRTest.at:316' \
+ "trans test_array_9.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "82. DMRTest.at:316: testing ..."
+ $as_echo "82. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11474,90 +9017,62 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_9.xml
baseline=$abs_srcdir/dmr-testsuite/universal/test_array_9.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:316: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:316 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:316"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:316: mv stdout \$baseline.tmp"
-echo DMRTest.at:316 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:316"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:316: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:316 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:316"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:316: diff -b -B \$baseline stdout"
-echo DMRTest.at:316 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:316"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:316"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11565,22 +9080,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_82
#AT_START_83
-# 83. DMRTest.at:317: trans test_array_12.xml
-at_setup_line='DMRTest.at:317'
-at_desc="trans test_array_12.xml"
-$at_quiet $as_echo_n " 83: $at_desc "
+at_fn_group_banner 83 'DMRTest.at:317' \
+ "trans test_array_12.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "83. DMRTest.at:317: testing ..."
+ $as_echo "83. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11593,90 +9104,62 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_12.xml
baseline=$abs_srcdir/dmr-testsuite/universal/test_array_12.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:317 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:317"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:317: mv stdout \$baseline.tmp"
-echo DMRTest.at:317 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:317"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:317 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:317"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:317: diff -b -B \$baseline stdout"
-echo DMRTest.at:317 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:317"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11684,22 +9167,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_83
#AT_START_84
-# 84. DMRTest.at:318: trans test_array_13.xml
-at_setup_line='DMRTest.at:318'
-at_desc="trans test_array_13.xml"
-$at_quiet $as_echo_n " 84: $at_desc "
+at_fn_group_banner 84 'DMRTest.at:318' \
+ "trans test_array_13.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "84. DMRTest.at:318: testing ..."
+ $as_echo "84. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11712,90 +9191,62 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_13.xml
baseline=$abs_srcdir/dmr-testsuite/universal/test_array_13.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:318 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:318"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:318: mv stdout \$baseline.tmp"
-echo DMRTest.at:318 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:318"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:318 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:318"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:318: diff -b -B \$baseline stdout"
-echo DMRTest.at:318 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:318"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11803,22 +9254,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_84
#AT_START_85
-# 85. DMRTest.at:319: trans test_array_14.xml
-at_setup_line='DMRTest.at:319'
-at_desc="trans test_array_14.xml"
-$at_quiet $as_echo_n " 85: $at_desc "
+at_fn_group_banner 85 'DMRTest.at:319' \
+ "trans test_array_14.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "85. DMRTest.at:319: testing ..."
+ $as_echo "85. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11831,90 +9278,62 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_14.xml
baseline=$abs_srcdir/dmr-testsuite/universal/test_array_14.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:319: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:319 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:319"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:319: mv stdout \$baseline.tmp"
-echo DMRTest.at:319 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:319"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:319: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:319 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:319"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:319: diff -b -B \$baseline stdout"
-echo DMRTest.at:319 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:319"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:319"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11922,22 +9341,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_85
#AT_START_86
-# 86. DMRTest.at:321: trans test_simple_6.2.xml
-at_setup_line='DMRTest.at:321'
-at_desc="trans test_simple_6.2.xml"
-$at_quiet $as_echo_n " 86: $at_desc "
+at_fn_group_banner 86 'DMRTest.at:321' \
+ "trans test_simple_6.2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "86. DMRTest.at:321: testing ..."
+ $as_echo "86. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11950,90 +9365,62 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_6.2.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:321: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:321 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:321"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:321: mv stdout \$baseline.tmp"
-echo DMRTest.at:321 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:321"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:321: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:321 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:321"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:321: diff -b -B \$baseline stdout"
-echo DMRTest.at:321 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:321"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -12041,22 +9428,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_86
#AT_START_87
-# 87. DMRTest.at:322: trans test_simple_6.3.xml
-at_setup_line='DMRTest.at:322'
-at_desc="trans test_simple_6.3.xml"
-$at_quiet $as_echo_n " 87: $at_desc "
+at_fn_group_banner 87 'DMRTest.at:322' \
+ "trans test_simple_6.3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "87. DMRTest.at:322: testing ..."
+ $as_echo "87. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12069,90 +9452,62 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_6.3.xml.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:322: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:322 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:322"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:322: mv stdout \$baseline.tmp"
-echo DMRTest.at:322 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:322"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:322: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:322 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:322"
+( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:322: diff -b -B \$baseline stdout"
-echo DMRTest.at:322 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:322"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -12160,22 +9515,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_87
#AT_START_88
-# 88. DMRTest.at:324: intern test_array_9.xml
-at_setup_line='DMRTest.at:324'
-at_desc="intern test_array_9.xml"
-$at_quiet $as_echo_n " 88: $at_desc "
+at_fn_group_banner 88 'DMRTest.at:324' \
+ "intern test_array_9.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "88. DMRTest.at:324: testing ..."
+ $as_echo "88. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12187,89 +9538,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_9.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_9.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:324: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:324 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:324"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:324: mv stdout \$baseline.tmp"
-echo DMRTest.at:324 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:324"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:324: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:324 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:324"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:324: diff -b -B \$baseline stdout"
-echo DMRTest.at:324 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:324"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:324"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -12277,22 +9600,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_88
#AT_START_89
-# 89. DMRTest.at:325: intern test_array_12.xml
-at_setup_line='DMRTest.at:325'
-at_desc="intern test_array_12.xml"
-$at_quiet $as_echo_n " 89: $at_desc "
+at_fn_group_banner 89 'DMRTest.at:325' \
+ "intern test_array_12.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "89. DMRTest.at:325: testing ..."
+ $as_echo "89. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12304,89 +9623,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_12.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_12.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:325: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:325 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:325"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:325: mv stdout \$baseline.tmp"
-echo DMRTest.at:325 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:325"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:325: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:325 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:325"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:325: diff -b -B \$baseline stdout"
-echo DMRTest.at:325 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:325"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -12394,22 +9685,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_89
#AT_START_90
-# 90. DMRTest.at:326: intern test_array_13.xml
-at_setup_line='DMRTest.at:326'
-at_desc="intern test_array_13.xml"
-$at_quiet $as_echo_n " 90: $at_desc "
+at_fn_group_banner 90 'DMRTest.at:326' \
+ "intern test_array_13.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "90. DMRTest.at:326: testing ..."
+ $as_echo "90. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12421,89 +9708,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_13.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_13.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:326 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:326"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:326: mv stdout \$baseline.tmp"
-echo DMRTest.at:326 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:326"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:326 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:326"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:326: diff -b -B \$baseline stdout"
-echo DMRTest.at:326 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:326"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -12511,22 +9770,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_90
#AT_START_91
-# 91. DMRTest.at:327: intern test_array_14.xml
-at_setup_line='DMRTest.at:327'
-at_desc="intern test_array_14.xml"
-$at_quiet $as_echo_n " 91: $at_desc "
+at_fn_group_banner 91 'DMRTest.at:327' \
+ "intern test_array_14.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "91. DMRTest.at:327: testing ..."
+ $as_echo "91. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12538,89 +9793,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_14.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_14.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:327: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:327 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:327"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:327: mv stdout \$baseline.tmp"
-echo DMRTest.at:327 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:327"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:327: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:327 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:327"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:327: diff -b -B \$baseline stdout"
-echo DMRTest.at:327 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:327"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:327"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -12628,22 +9855,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_91
#AT_START_92
-# 92. DMRTest.at:329: intern test_simple_6.2.xml
-at_setup_line='DMRTest.at:329'
-at_desc="intern test_simple_6.2.xml"
-$at_quiet $as_echo_n " 92: $at_desc "
+at_fn_group_banner 92 'DMRTest.at:329' \
+ "intern test_simple_6.2.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "92. DMRTest.at:329: testing ..."
+ $as_echo "92. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12655,89 +9878,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.2.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:329: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:329 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:329"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:329: mv stdout \$baseline.tmp"
-echo DMRTest.at:329 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:329"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:329: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:329 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:329"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:329: diff -b -B \$baseline stdout"
-echo DMRTest.at:329 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:329"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:329"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -12745,22 +9940,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_92
#AT_START_93
-# 93. DMRTest.at:330: intern test_simple_6.3.xml
-at_setup_line='DMRTest.at:330'
-at_desc="intern test_simple_6.3.xml"
-$at_quiet $as_echo_n " 93: $at_desc "
+at_fn_group_banner 93 'DMRTest.at:330' \
+ "intern test_simple_6.3.xml" " "
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "93. DMRTest.at:330: testing ..."
+ $as_echo "93. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12772,89 +9963,61 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.3.xml.intern_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:330: \$abs_builddir/dmr-test -x -i \$input"
-echo DMRTest.at:330 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:330"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:330: mv stdout \$baseline.tmp"
-echo DMRTest.at:330 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:330"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:330: \$abs_builddir/dmr-test -x -i \$input || true"
-echo DMRTest.at:330 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:330"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:330: diff -b -B \$baseline stdout"
-echo DMRTest.at:330 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:330"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:330"
+$at_failed && at_fn_log_failure
$at_traceon; }
@@ -12862,22 +10025,18 @@ $at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_93
#AT_START_94
-# 94. DMRTest.at:338: trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base
-at_setup_line='DMRTest.at:338'
-at_desc="trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base"
-$at_quiet $as_echo_n " 94: $at_desc"
+at_fn_group_banner 94 'DMRTest.at:346' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "94. DMRTest.at:338: testing ..."
+ $as_echo "94. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12886,111 +10045,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\""
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row;x\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row;x" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "row;x" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:346"
+( $at_check_trace; mv stdout $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:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\" || true"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row;x\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row;x" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "row;x" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_94
#AT_START_95
-# 95. DMRTest.at:338: trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base
-at_setup_line='DMRTest.at:338'
-at_desc="trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base"
-$at_quiet $as_echo_n " 95: $at_desc"
+at_fn_group_banner 95 'DMRTest.at:346' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "95. DMRTest.at:338: testing ..."
+ $as_echo "95. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12999,111 +10126,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
-
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\""
-echo DMRTest.at:338 >"$at_check_line_file"
+ if test -n "$baselines" -a x$baselines = xyes; then :
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:346"
+( $at_check_trace; mv stdout $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:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\" || true"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_95
#AT_START_96
-# 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
-at_setup_line='DMRTest.at:338'
-at_desc="trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base"
-$at_quiet $as_echo_n " 96: $at_desc"
+at_fn_group_banner 96 'DMRTest.at:346' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "96. DMRTest.at:338: testing ..."
+ $as_echo "96. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13112,111 +10207,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\""
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:346"
+( $at_check_trace; mv stdout $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:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\" || true"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_96
#AT_START_97
-# 97. DMRTest.at:338: trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base
-at_setup_line='DMRTest.at:338'
-at_desc="trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base"
-$at_quiet $as_echo_n " 97: $at_desc"
+at_fn_group_banner 97 'DMRTest.at:346' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "97. DMRTest.at:338: testing ..."
+ $as_echo "97. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13225,111 +10288,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
-
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\""
-echo DMRTest.at:338 >"$at_check_line_file"
+ if test -n "$baselines" -a x$baselines = xyes; then :
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:346"
+( $at_check_trace; mv stdout $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:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\" || true"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_97
#AT_START_98
-# 98. DMRTest.at:338: trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base
-at_setup_line='DMRTest.at:338'
-at_desc="trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base"
-$at_quiet $as_echo_n " 98: $at_desc"
+at_fn_group_banner 98 'DMRTest.at:346' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "98. DMRTest.at:338: testing ..."
+ $as_echo "98. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13338,111 +10369,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.5.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"x\""
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "x" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: mv stdout \$baseline.tmp"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: mv stdout \$baseline.tmp"
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:346"
+( $at_check_trace; mv stdout $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:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: \$abs_builddir/dmr-test -x -t \$input -c \"x\" || true"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "x" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: \$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:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:338: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:338 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$as_echo "$at_srcdir/DMRTest.at:346: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:346"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:338"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_98
#AT_START_99
-# 99. DMRTest.at:350: trans ce test_array_4.xml a test_array_4.xml.1.trans_base
-at_setup_line='DMRTest.at:350'
-at_desc="trans ce test_array_4.xml a test_array_4.xml.1.trans_base"
-$at_quiet $as_echo_n " 99: $at_desc"
+at_fn_group_banner 99 'DMRTest.at:350' \
+ "trans ce test_array_4.xml a test_array_4.xml.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "99. DMRTest.at:350: testing ..."
+ $as_echo "99. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13451,111 +10450,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:350: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
-echo DMRTest.at:350 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:350"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:350: mv stdout \$baseline.tmp"
-echo DMRTest.at:350 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:350"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:350: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
-echo DMRTest.at:350 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:350"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:350: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:350 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:350"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:350"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_99
#AT_START_100
-# 100. DMRTest.at:351: trans ce test_array_4.xml a[][] test_array_4.xml.1.trans_base
-at_setup_line='DMRTest.at:351'
-at_desc="trans ce test_array_4.xml a[][] test_array_4.xml.1.trans_base"
-$at_quiet $as_echo_n "100: $at_desc"
+at_fn_group_banner 100 'DMRTest.at:351' \
+ "trans ce test_array_4.xml a[][] test_array_4.xml.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "100. DMRTest.at:351: testing ..."
+ $as_echo "100. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13564,111 +10531,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:351: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \""
-echo DMRTest.at:351 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:351"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:351: mv stdout \$baseline.tmp"
-echo DMRTest.at:351 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:351"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:351: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true"
-echo DMRTest.at:351 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true" "DMRTest.at:351"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:351: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:351 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:351"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_100
#AT_START_101
-# 101. DMRTest.at:353: trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base
-at_setup_line='DMRTest.at:353'
-at_desc="trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base"
-$at_quiet $as_echo_n "101: $at_desc"
+at_fn_group_banner 101 'DMRTest.at:353' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "101. DMRTest.at:353: testing ..."
+ $as_echo "101. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13677,111 +10612,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:353: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\""
-echo DMRTest.at:353 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\"" "DMRTest.at:353"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:353: mv stdout \$baseline.tmp"
-echo DMRTest.at:353 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:353"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:353: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\" || true"
-echo DMRTest.at:353 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\" || true" "DMRTest.at:353"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:353: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:353 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:353"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_101
#AT_START_102
-# 102. DMRTest.at:355: trans ce test_array_4.xml /row=[0:1];/col=[3];a[][] test_array_4.xml.4.trans_base
-at_setup_line='DMRTest.at:355'
-at_desc="trans ce test_array_4.xml /row=[0:1];/col=[3];a[][] test_array_4.xml.4.trans_base"
-$at_quiet $as_echo_n "102: $at_desc"
+at_fn_group_banner 102 'DMRTest.at:355' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "102. DMRTest.at:355: testing ..."
+ $as_echo "102. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13790,111 +10693,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:355: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \""
-echo DMRTest.at:355 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \"" "DMRTest.at:355"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:355: mv stdout \$baseline.tmp"
-echo DMRTest.at:355 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:355"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:355: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \" || true"
-echo DMRTest.at:355 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \" || true" "DMRTest.at:355"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:355: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:355 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:355"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_102
#AT_START_103
-# 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
-at_setup_line='DMRTest.at:357'
-at_desc="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_quiet $as_echo_n "103: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "103. DMRTest.at:357: testing ..."
+ $as_echo "103. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13903,111 +10774,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.5.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { 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:] \""
-echo DMRTest.at:357 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:357: mv stdout \$baseline.tmp"
-echo DMRTest.at:357 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:357"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:357 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $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"
-fi
-at_status=$?
-at_failed=false
+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"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:357: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:357 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:357"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:357"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_103
#AT_START_104
-# 104. DMRTest.at:359: trans ce test_array_4.xml x[][] /test_array_4.xml.6.trans_base
-at_setup_line='DMRTest.at:359'
-at_desc="trans ce test_array_4.xml x[][] /test_array_4.xml.6.trans_base"
-$at_quiet $as_echo_n "104: $at_desc"
+at_fn_group_banner 104 'DMRTest.at:359' \
+ "trans ce test_array_4.xml x[][] /test_array_4.xml.6.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "104. DMRTest.at:359: testing ..."
+ $as_echo "104. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14016,111 +10855,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER//test_array_4.xml.6.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:359: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \""
-echo DMRTest.at:359 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x[][] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x[][] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "x[][] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[][] \"" "DMRTest.at:359"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:359: mv stdout \$baseline.tmp"
-echo DMRTest.at:359 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:359"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:359: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \" || true"
-echo DMRTest.at:359 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x[][] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x[][] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "x[][] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[][] \" || true" "DMRTest.at:359"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:359: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:359 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:359"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:359"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_104
#AT_START_105
-# 105. DMRTest.at:360: trans ce test_array_4.xml /row=[0:1];x[][] test_array_4.xml.7.trans_base
-at_setup_line='DMRTest.at:360'
-at_desc="trans ce test_array_4.xml /row=[0:1];x[][] test_array_4.xml.7.trans_base"
-$at_quiet $as_echo_n "105: $at_desc"
+at_fn_group_banner 105 'DMRTest.at:360' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "105. DMRTest.at:360: testing ..."
+ $as_echo "105. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14129,111 +10936,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.7.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:360: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \""
-echo DMRTest.at:360 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \"" "DMRTest.at:360"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:360: mv stdout \$baseline.tmp"
-echo DMRTest.at:360 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:360"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:360: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \" || true"
-echo DMRTest.at:360 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \" || true" "DMRTest.at:360"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:360: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:360 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:360"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_105
#AT_START_106
-# 106. DMRTest.at:362: trans ce test_array_4.xml c[2:][2:] test_array_4.xml.8.trans_base
-at_setup_line='DMRTest.at:362'
-at_desc="trans ce test_array_4.xml c[2:][2:] test_array_4.xml.8.trans_base"
-$at_quiet $as_echo_n "106: $at_desc"
+at_fn_group_banner 106 'DMRTest.at:362' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "106. DMRTest.at:362: testing ..."
+ $as_echo "106. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14242,111 +11017,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_4.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.8.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:362: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \""
-echo DMRTest.at:362 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \"" "DMRTest.at:362"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:362: mv stdout \$baseline.tmp"
-echo DMRTest.at:362 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:362"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:362: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \" || true"
-echo DMRTest.at:362 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \" || true" "DMRTest.at:362"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:362: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:362 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:362"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_106
#AT_START_107
-# 107. DMRTest.at:364: trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base
-at_setup_line='DMRTest.at:364'
-at_desc="trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base"
-$at_quiet $as_echo_n "107: $at_desc"
+at_fn_group_banner 107 'DMRTest.at:364' \
+ "trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "107. DMRTest.at:364: testing ..."
+ $as_echo "107. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14355,111 +11098,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:364: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
-echo DMRTest.at:364 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:364"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:364: mv stdout \$baseline.tmp"
-echo DMRTest.at:364 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:364"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:364: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
-echo DMRTest.at:364 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:364"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:364: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:364 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:364"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:364"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_107
#AT_START_108
-# 108. DMRTest.at:365: trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base
-at_setup_line='DMRTest.at:365'
-at_desc="trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base"
-$at_quiet $as_echo_n "108: $at_desc"
+at_fn_group_banner 108 'DMRTest.at:365' \
+ "trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "108. DMRTest.at:365: testing ..."
+ $as_echo "108. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14468,111 +11179,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
-echo DMRTest.at:365 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:365"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:365: mv stdout \$baseline.tmp"
-echo DMRTest.at:365 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:365"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
-echo DMRTest.at:365 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:365"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:365 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_108
#AT_START_109
-# 109. DMRTest.at:366: trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base
-at_setup_line='DMRTest.at:366'
-at_desc="trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base"
-$at_quiet $as_echo_n "109: $at_desc"
+at_fn_group_banner 109 'DMRTest.at:366' \
+ "trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "109. DMRTest.at:366: testing ..."
+ $as_echo "109. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14581,111 +11260,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:366: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\""
-echo DMRTest.at:366 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.s\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.s" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.s" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.s\"" "DMRTest.at:366"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:366: mv stdout \$baseline.tmp"
-echo DMRTest.at:366 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:366"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:366: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\" || true"
-echo DMRTest.at:366 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.s\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.s" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.s" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.s\" || true" "DMRTest.at:366"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:366: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:366 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:366"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_109
#AT_START_110
-# 110. DMRTest.at:367: trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base
-at_setup_line='DMRTest.at:367'
-at_desc="trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base"
-$at_quiet $as_echo_n "110: $at_desc"
+at_fn_group_banner 110 'DMRTest.at:367' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "110. DMRTest.at:367: testing ..."
+ $as_echo "110. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14694,111 +11341,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:367: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\""
-echo DMRTest.at:367 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\"" "DMRTest.at:367"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:367: mv stdout \$baseline.tmp"
-echo DMRTest.at:367 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:367"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:367: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\" || true"
-echo DMRTest.at:367 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\" || true" "DMRTest.at:367"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:367: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:367 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:367"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_110
#AT_START_111
-# 111. DMRTest.at:369: trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base
-at_setup_line='DMRTest.at:369'
-at_desc="trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base"
-$at_quiet $as_echo_n "111: $at_desc"
+at_fn_group_banner 111 'DMRTest.at:369' \
+ "trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "111. DMRTest.at:369: testing ..."
+ $as_echo "111. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14807,111 +11422,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:369: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
-echo DMRTest.at:369 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:369"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:369: mv stdout \$baseline.tmp"
-echo DMRTest.at:369 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:369"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:369: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
-echo DMRTest.at:369 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:369"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:369: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:369 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:369"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_111
#AT_START_112
-# 112. DMRTest.at:370: trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base
-at_setup_line='DMRTest.at:370'
-at_desc="trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base"
-$at_quiet $as_echo_n "112: $at_desc"
+at_fn_group_banner 112 'DMRTest.at:370' \
+ "trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "112. DMRTest.at:370: testing ..."
+ $as_echo "112. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14920,111 +11503,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:370: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\""
-echo DMRTest.at:370 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{s}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{s}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{s}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{s}\"" "DMRTest.at:370"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:370: mv stdout \$baseline.tmp"
-echo DMRTest.at:370 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:370"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:370: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\" || true"
-echo DMRTest.at:370 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{s}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{s}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{s}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{s}\" || true" "DMRTest.at:370"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:370: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:370 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:370"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_112
#AT_START_113
-# 113. DMRTest.at:371: trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base
-at_setup_line='DMRTest.at:371'
-at_desc="trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base"
-$at_quiet $as_echo_n "113: $at_desc"
+at_fn_group_banner 113 'DMRTest.at:371' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "113. DMRTest.at:371: testing ..."
+ $as_echo "113. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15033,111 +11584,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:371: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\""
-echo DMRTest.at:371 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\"" "DMRTest.at:371"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:371: mv stdout \$baseline.tmp"
-echo DMRTest.at:371 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:371"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:371: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\" || true"
-echo DMRTest.at:371 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\" || true" "DMRTest.at:371"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:371: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:371 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:371"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_113
#AT_START_114
-# 114. DMRTest.at:372: trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base
-at_setup_line='DMRTest.at:372'
-at_desc="trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base"
-$at_quiet $as_echo_n "114: $at_desc"
+at_fn_group_banner 114 'DMRTest.at:372' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "114. DMRTest.at:372: testing ..."
+ $as_echo "114. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15146,111 +11665,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\""
-echo DMRTest.at:372 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\"" "DMRTest.at:372"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:372: mv stdout \$baseline.tmp"
-echo DMRTest.at:372 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:372"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\" || true"
-echo DMRTest.at:372 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\" || true" "DMRTest.at:372"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:372: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:372 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_114
#AT_START_115
-# 115. DMRTest.at:375: trans ce test_array_6.xml a test_array_6.xml.1.trans_base
-at_setup_line='DMRTest.at:375'
-at_desc="trans ce test_array_6.xml a test_array_6.xml.1.trans_base"
-$at_quiet $as_echo_n "115: $at_desc"
+at_fn_group_banner 115 'DMRTest.at:375' \
+ "trans ce test_array_6.xml a test_array_6.xml.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "115. DMRTest.at:375: testing ..."
+ $as_echo "115. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15259,111 +11746,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:375: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
-echo DMRTest.at:375 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:375"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:375: mv stdout \$baseline.tmp"
-echo DMRTest.at:375 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:375"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:375: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
-echo DMRTest.at:375 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:375"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:375: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:375 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:375"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:375"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_115
#AT_START_116
-# 116. DMRTest.at:376: trans ce test_array_6.xml a[][] test_array_6.xml.1.trans_base
-at_setup_line='DMRTest.at:376'
-at_desc="trans ce test_array_6.xml a[][] test_array_6.xml.1.trans_base"
-$at_quiet $as_echo_n "116: $at_desc"
+at_fn_group_banner 116 'DMRTest.at:376' \
+ "trans ce test_array_6.xml a[][] test_array_6.xml.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "116. DMRTest.at:376: testing ..."
+ $as_echo "116. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15372,111 +11827,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:376: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \""
-echo DMRTest.at:376 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:376"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:376: mv stdout \$baseline.tmp"
-echo DMRTest.at:376 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:376"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:376: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true"
-echo DMRTest.at:376 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true" "DMRTest.at:376"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:376: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:376 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:376"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_116
#AT_START_117
-# 117. DMRTest.at:377: trans ce test_array_6.xml /row=[0:1];a[][] test_array_6.xml.2.trans_base
-at_setup_line='DMRTest.at:377'
-at_desc="trans ce test_array_6.xml /row=[0:1];a[][] test_array_6.xml.2.trans_base"
-$at_quiet $as_echo_n "117: $at_desc"
+at_fn_group_banner 117 'DMRTest.at:377' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "117. DMRTest.at:377: testing ..."
+ $as_echo "117. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15485,111 +11908,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:377: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \""
-echo DMRTest.at:377 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \"" "DMRTest.at:377"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:377: mv stdout \$baseline.tmp"
-echo DMRTest.at:377 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:377"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:377: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \" || true"
-echo DMRTest.at:377 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \" || true" "DMRTest.at:377"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:377: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:377 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:377"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_117
#AT_START_118
-# 118. DMRTest.at:378: trans ce test_array_6.xml /row=[0:1];a[][1:2] test_array_6.xml.3.trans_base
-at_setup_line='DMRTest.at:378'
-at_desc="trans ce test_array_6.xml /row=[0:1];a[][1:2] test_array_6.xml.3.trans_base"
-$at_quiet $as_echo_n "118: $at_desc"
+at_fn_group_banner 118 'DMRTest.at:378' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "118. DMRTest.at:378: testing ..."
+ $as_echo "118. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15598,111 +11989,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \""
-echo DMRTest.at:378 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \"" "DMRTest.at:378"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:378: mv stdout \$baseline.tmp"
-echo DMRTest.at:378 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:378"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \" || true"
-echo DMRTest.at:378 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \" || true" "DMRTest.at:378"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:378: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:378 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_118
#AT_START_119
-# 119. DMRTest.at:381: trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base
-at_setup_line='DMRTest.at:381'
-at_desc="trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base"
-$at_quiet $as_echo_n "119: $at_desc"
+at_fn_group_banner 119 'DMRTest.at:381' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "119. DMRTest.at:381: testing ..."
+ $as_echo "119. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15711,111 +12070,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
-echo DMRTest.at:381 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:381"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:381: mv stdout \$baseline.tmp"
-echo DMRTest.at:381 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:381"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
-echo DMRTest.at:381 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:381"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:381: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:381 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_119
#AT_START_120
-# 120. DMRTest.at:382: trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base
-at_setup_line='DMRTest.at:382'
-at_desc="trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base"
-$at_quiet $as_echo_n "120: $at_desc"
+at_fn_group_banner 120 'DMRTest.at:382' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "120. DMRTest.at:382: testing ..."
+ $as_echo "120. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15824,111 +12151,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:382: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\""
-echo DMRTest.at:382 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\"" "DMRTest.at:382"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:382: mv stdout \$baseline.tmp"
-echo DMRTest.at:382 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:382"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:382: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\" || true"
-echo DMRTest.at:382 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\" || true" "DMRTest.at:382"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:382: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:382 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:382"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_120
#AT_START_121
-# 121. DMRTest.at:383: trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base
-at_setup_line='DMRTest.at:383'
-at_desc="trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base"
-$at_quiet $as_echo_n "121: $at_desc"
+at_fn_group_banner 121 'DMRTest.at:383' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "121. DMRTest.at:383: testing ..."
+ $as_echo "121. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15937,111 +12232,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\""
-echo DMRTest.at:383 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.i\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.i" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a.i" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\"" "DMRTest.at:383"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:383: mv stdout \$baseline.tmp"
-echo DMRTest.at:383 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:383"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\" || true"
-echo DMRTest.at:383 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.i\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.i" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a.i" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\" || true" "DMRTest.at:383"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:383: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:383 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_121
#AT_START_122
-# 122. DMRTest.at:384: trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base
-at_setup_line='DMRTest.at:384'
-at_desc="trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base"
-$at_quiet $as_echo_n "122: $at_desc"
+at_fn_group_banner 122 'DMRTest.at:384' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "122. DMRTest.at:384: testing ..."
+ $as_echo "122. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16050,111 +12313,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\""
-echo DMRTest.at:384 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a{i}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\"" "DMRTest.at:384"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:384: mv stdout \$baseline.tmp"
-echo DMRTest.at:384 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:384"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\" || true"
-echo DMRTest.at:384 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a{i}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\" || true" "DMRTest.at:384"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:384: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:384 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_122
#AT_START_123
-# 123. DMRTest.at:385: trans ce test_array_6.2.xml a.i[0][1:2] test_array_6.2.xml.3.trans_base
-at_setup_line='DMRTest.at:385'
-at_desc="trans ce test_array_6.2.xml a.i[0][1:2] test_array_6.2.xml.3.trans_base"
-$at_quiet $as_echo_n "123: $at_desc"
+at_fn_group_banner 123 'DMRTest.at:385' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "123. DMRTest.at:385: testing ..."
+ $as_echo "123. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16163,111 +12394,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:385: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \""
-echo DMRTest.at:385 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \"" "DMRTest.at:385"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:385: mv stdout \$baseline.tmp"
-echo DMRTest.at:385 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:385"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:385: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \" || true"
-echo DMRTest.at:385 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \" || true" "DMRTest.at:385"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:385: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:385 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:385"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_123
#AT_START_124
-# 124. DMRTest.at:386: trans ce test_array_6.2.xml a{i[0][1:2]} test_array_6.2.xml.3.trans_base
-at_setup_line='DMRTest.at:386'
-at_desc="trans ce test_array_6.2.xml a{i[0][1:2]} test_array_6.2.xml.3.trans_base"
-$at_quiet $as_echo_n "124: $at_desc"
+at_fn_group_banner 124 'DMRTest.at:386' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "124. DMRTest.at:386: testing ..."
+ $as_echo "124. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16276,111 +12475,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \""
-echo DMRTest.at:386 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \"" "DMRTest.at:386"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:386: mv stdout \$baseline.tmp"
-echo DMRTest.at:386 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:386"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \" || true"
-echo DMRTest.at:386 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \" || true" "DMRTest.at:386"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:386: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:386 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_124
#AT_START_125
-# 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
-at_setup_line='DMRTest.at:387'
-at_desc="trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2] test_array_6.2.xml.4.trans_base"
-$at_quiet $as_echo_n "125: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "125. DMRTest.at:387: testing ..."
+ $as_echo "125. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16389,111 +12556,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:387: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \""
-echo DMRTest.at:387 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \"" "DMRTest.at:387"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:387: mv stdout \$baseline.tmp"
-echo DMRTest.at:387 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:387"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:387 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \" || true" "DMRTest.at:387"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:387: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:387 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:387"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:387"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_125
#AT_START_126
-# 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
-at_setup_line='DMRTest.at:388'
-at_desc="trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]} test_array_6.2.xml.4.trans_base"
-$at_quiet $as_echo_n "126: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "126. DMRTest.at:388: testing ..."
+ $as_echo "126. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16502,111 +12637,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:388: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \""
-echo DMRTest.at:388 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \"" "DMRTest.at:388"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:388: mv stdout \$baseline.tmp"
-echo DMRTest.at:388 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:388"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:388 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \" || true" "DMRTest.at:388"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:388: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:388 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:388"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_126
#AT_START_127
-# 127. DMRTest.at:390: trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base
-at_setup_line='DMRTest.at:390'
-at_desc="trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base"
-$at_quiet $as_echo_n "127: $at_desc"
+at_fn_group_banner 127 'DMRTest.at:390' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "127. DMRTest.at:390: testing ..."
+ $as_echo "127. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16615,111 +12718,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.5.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:390: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\""
-echo DMRTest.at:390 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.j\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.j" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a.j" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.j\"" "DMRTest.at:390"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:390: mv stdout \$baseline.tmp"
-echo DMRTest.at:390 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:390"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:390: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\" || true"
-echo DMRTest.at:390 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.j\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.j" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a.j" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.j\" || true" "DMRTest.at:390"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:390: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:390 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:390"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_127
#AT_START_128
-# 128. DMRTest.at:393: trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base
-at_setup_line='DMRTest.at:393'
-at_desc="trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base"
-$at_quiet $as_echo_n "128: $at_desc"
+at_fn_group_banner 128 'DMRTest.at:393' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "128. DMRTest.at:393: testing ..."
+ $as_echo "128. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16728,111 +12799,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:393: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
-echo DMRTest.at:393 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:393"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:393: mv stdout \$baseline.tmp"
-echo DMRTest.at:393 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:393"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:393: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
-echo DMRTest.at:393 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:393"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:393: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:393 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:393"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_128
#AT_START_129
-# 129. DMRTest.at:396: trans ce test_array_6.1.xml /row=[1:2];a[][0] test_array_6.1.xml.2.trans_base
-at_setup_line='DMRTest.at:396'
-at_desc="trans ce test_array_6.1.xml /row=[1:2];a[][0] test_array_6.1.xml.2.trans_base"
-$at_quiet $as_echo_n "129: $at_desc"
+at_fn_group_banner 129 'DMRTest.at:396' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "129. DMRTest.at:396: testing ..."
+ $as_echo "129. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16841,111 +12880,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:396: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \""
-echo DMRTest.at:396 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \"" "DMRTest.at:396"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:396: mv stdout \$baseline.tmp"
-echo DMRTest.at:396 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:396"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:396: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \" || true"
-echo DMRTest.at:396 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \" || true" "DMRTest.at:396"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:396: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:396 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:396"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_129
#AT_START_130
-# 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
-at_setup_line='DMRTest.at:397'
-at_desc="trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j} test_array_6.1.xml.2.trans_base"
-$at_quiet $as_echo_n "130: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "130. DMRTest.at:397: testing ..."
+ $as_echo "130. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16954,111 +12961,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:397: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \""
-echo DMRTest.at:397 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \"" "DMRTest.at:397"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:397"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:397: mv stdout \$baseline.tmp"
-echo DMRTest.at:397 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:397"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:397"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:397 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \" || true" "DMRTest.at:397"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:397"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:397"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:397: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:397 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:397"
-
-$at_failed && at_func_log_failure
+ { 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"
+( $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_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_130
#AT_START_131
-# 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
-at_setup_line='DMRTest.at:399'
-at_desc="trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j} test_array_6.1.xml.2.trans_base"
-$at_quiet $as_echo_n "131: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "131. DMRTest.at:399: testing ..."
+ $as_echo "131. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17067,111 +13042,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:399: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \""
-echo DMRTest.at:399 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \"" "DMRTest.at:399"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:399: mv stdout \$baseline.tmp"
-echo DMRTest.at:399 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:399"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:399 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \" || true" "DMRTest.at:399"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:399: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:399 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:399"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_131
#AT_START_132
-# 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
-at_setup_line='DMRTest.at:402'
-at_desc="trans ce test_array_6.1.xml a{i[1:2][1:3];j} test_array_6.1.xml.3.trans_base"
-$at_quiet $as_echo_n "132: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "132. DMRTest.at:402: testing ..."
+ $as_echo "132. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17180,111 +13123,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:402: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \""
-echo DMRTest.at:402 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \"" "DMRTest.at:402"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:402: mv stdout \$baseline.tmp"
-echo DMRTest.at:402 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:402"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:402 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \" || true" "DMRTest.at:402"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:402: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:402 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:402"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_132
#AT_START_133
-# 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
-at_setup_line='DMRTest.at:403'
-at_desc="trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j} test_array_6.1.xml.3.trans_base"
-$at_quiet $as_echo_n "133: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "133. DMRTest.at:403: testing ..."
+ $as_echo "133. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17293,111 +13204,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \""
-echo DMRTest.at:403 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \"" "DMRTest.at:403"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:403: mv stdout \$baseline.tmp"
-echo DMRTest.at:403 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:403"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:403 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \" || true" "DMRTest.at:403"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:403: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:403 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_133
#AT_START_134
-# 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
-at_setup_line='DMRTest.at:407'
-at_desc="trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]} test_array_6.1.xml.4.trans_base"
-$at_quiet $as_echo_n "134: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "134. DMRTest.at:407: testing ..."
+ $as_echo "134. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17406,111 +13285,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \""
-echo DMRTest.at:407 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \"" "DMRTest.at:407"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:407: mv stdout \$baseline.tmp"
-echo DMRTest.at:407 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:407"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:407 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \" || true" "DMRTest.at:407"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:407: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:407 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_134
#AT_START_135
-# 135. DMRTest.at:410: trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base
-at_setup_line='DMRTest.at:410'
-at_desc="trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base"
-$at_quiet $as_echo_n "135: $at_desc"
+at_fn_group_banner 135 'DMRTest.at:410' \
+ "trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "135. DMRTest.at:410: testing ..."
+ $as_echo "135. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17519,111 +13366,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:410: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
-echo DMRTest.at:410 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:410"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:410: mv stdout \$baseline.tmp"
-echo DMRTest.at:410 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:410"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:410: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
-echo DMRTest.at:410 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:410"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:410: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:410 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:410"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_135
#AT_START_136
-# 136. DMRTest.at:411: trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base
-at_setup_line='DMRTest.at:411'
-at_desc="trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base"
-$at_quiet $as_echo_n "136: $at_desc"
+at_fn_group_banner 136 'DMRTest.at:411' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "136. DMRTest.at:411: testing ..."
+ $as_echo "136. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17632,111 +13447,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:411: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\""
-echo DMRTest.at:411 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\"" "DMRTest.at:411"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:411: mv stdout \$baseline.tmp"
-echo DMRTest.at:411 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:411"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:411: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true"
-echo DMRTest.at:411 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true" "DMRTest.at:411"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:411: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:411 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:411"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:411"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_136
#AT_START_137
-# 137. DMRTest.at:413: trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base
-at_setup_line='DMRTest.at:413'
-at_desc="trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base"
-$at_quiet $as_echo_n "137: $at_desc"
+at_fn_group_banner 137 'DMRTest.at:413' \
+ "trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "137. DMRTest.at:413: testing ..."
+ $as_echo "137. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17745,111 +13528,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:413: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
-echo DMRTest.at:413 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:413"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:413: mv stdout \$baseline.tmp"
-echo DMRTest.at:413 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:413"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:413: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
-echo DMRTest.at:413 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:413"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:413: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:413 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:413"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_137
#AT_START_138
-# 138. DMRTest.at:414: trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base
-at_setup_line='DMRTest.at:414'
-at_desc="trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base"
-$at_quiet $as_echo_n "138: $at_desc"
+at_fn_group_banner 138 'DMRTest.at:414' \
+ "trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "138. DMRTest.at:414: testing ..."
+ $as_echo "138. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17858,111 +13609,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:414: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
-echo DMRTest.at:414 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:414"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:414: mv stdout \$baseline.tmp"
-echo DMRTest.at:414 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:414"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:414: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
-echo DMRTest.at:414 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:414"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:414: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:414 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:414"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_138
#AT_START_139
-# 139. DMRTest.at:416: trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base
-at_setup_line='DMRTest.at:416'
-at_desc="trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base"
-$at_quiet $as_echo_n "139: $at_desc"
+at_fn_group_banner 139 'DMRTest.at:416' \
+ "trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base" ""
at_xfail=no
test "Xxfail" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "139. DMRTest.at:416: testing ..."
+ $as_echo "139. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17971,111 +13690,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"outer\""
-echo DMRTest.at:416 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "outer" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\"" "DMRTest.at:416"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:416: mv stdout \$baseline.tmp"
-echo DMRTest.at:416 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:416"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"outer\" || true"
-echo DMRTest.at:416 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "outer" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\" || true" "DMRTest.at:416"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:416: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:416 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_139
#AT_START_140
-# 140. DMRTest.at:417: trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base
-at_setup_line='DMRTest.at:417'
-at_desc="trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base"
-$at_quiet $as_echo_n "140: $at_desc"
+at_fn_group_banner 140 'DMRTest.at:417' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "140. DMRTest.at:417: testing ..."
+ $as_echo "140. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18084,111 +13771,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:417: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\""
-echo DMRTest.at:417 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\"" "DMRTest.at:417"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:417: mv stdout \$baseline.tmp"
-echo DMRTest.at:417 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:417"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:417: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\" || true"
-echo DMRTest.at:417 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\" || true" "DMRTest.at:417"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:417: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:417 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:417"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_140
#AT_START_141
-# 141. DMRTest.at:418: trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base
-at_setup_line='DMRTest.at:418'
-at_desc="trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base"
-$at_quiet $as_echo_n "141: $at_desc"
+at_fn_group_banner 141 'DMRTest.at:418' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "141. DMRTest.at:418: testing ..."
+ $as_echo "141. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18197,111 +13852,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:418: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\""
-echo DMRTest.at:418 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\"" "DMRTest.at:418"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:418: mv stdout \$baseline.tmp"
-echo DMRTest.at:418 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:418"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:418: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\" || true"
-echo DMRTest.at:418 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\" || true" "DMRTest.at:418"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:418: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:418 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:418"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_141
#AT_START_142
-# 142. DMRTest.at:420: trans ce test_array_7.xml s test_array_7.xml.1.trans_base
-at_setup_line='DMRTest.at:420'
-at_desc="trans ce test_array_7.xml s test_array_7.xml.1.trans_base"
-$at_quiet $as_echo_n "142: $at_desc"
+at_fn_group_banner 142 'DMRTest.at:420' \
+ "trans ce test_array_7.xml s test_array_7.xml.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "142. DMRTest.at:420: testing ..."
+ $as_echo "142. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18310,111 +13933,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:420: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
-echo DMRTest.at:420 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:420"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:420: mv stdout \$baseline.tmp"
-echo DMRTest.at:420 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:420"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:420: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
-echo DMRTest.at:420 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:420"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:420: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:420 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:420"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_142
#AT_START_143
-# 143. DMRTest.at:421: trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base
-at_setup_line='DMRTest.at:421'
-at_desc="trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base"
-$at_quiet $as_echo_n "143: $at_desc"
+at_fn_group_banner 143 'DMRTest.at:421' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "143. DMRTest.at:421: testing ..."
+ $as_echo "143. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18423,111 +14014,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:421: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\""
-echo DMRTest.at:421 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\"" "DMRTest.at:421"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:421: mv stdout \$baseline.tmp"
-echo DMRTest.at:421 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:421"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:421: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true"
-echo DMRTest.at:421 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true" "DMRTest.at:421"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:421: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:421 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:421"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_143
#AT_START_144
-# 144. DMRTest.at:423: trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base
-at_setup_line='DMRTest.at:423'
-at_desc="trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base"
-$at_quiet $as_echo_n "144: $at_desc"
+at_fn_group_banner 144 'DMRTest.at:423' \
+ "trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "144. DMRTest.at:423: testing ..."
+ $as_echo "144. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18536,111 +14095,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:423: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
-echo DMRTest.at:423 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:423"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:423: mv stdout \$baseline.tmp"
-echo DMRTest.at:423 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:423"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:423: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
-echo DMRTest.at:423 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:423"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:423: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:423 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:423"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_144
#AT_START_145
-# 145. DMRTest.at:424: trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base
-at_setup_line='DMRTest.at:424'
-at_desc="trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base"
-$at_quiet $as_echo_n "145: $at_desc"
+at_fn_group_banner 145 'DMRTest.at:424' \
+ "trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "145. DMRTest.at:424: testing ..."
+ $as_echo "145. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18649,111 +14176,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:424: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
-echo DMRTest.at:424 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:424"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:424: mv stdout \$baseline.tmp"
-echo DMRTest.at:424 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:424"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:424: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
-echo DMRTest.at:424 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:424"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:424: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:424 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:424"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:424"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_145
#AT_START_146
-# 146. DMRTest.at:426: trans ce test_array_7.xml s[1] test_array_7.xml.3.trans_base
-at_setup_line='DMRTest.at:426'
-at_desc="trans ce test_array_7.xml s[1] test_array_7.xml.3.trans_base"
-$at_quiet $as_echo_n "146: $at_desc"
+at_fn_group_banner 146 'DMRTest.at:426' \
+ "trans ce test_array_7.xml s[1] test_array_7.xml.3.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "146. DMRTest.at:426: testing ..."
+ $as_echo "146. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18762,111 +14257,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:426: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \""
-echo DMRTest.at:426 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s[1] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1] \"" "DMRTest.at:426"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:426: mv stdout \$baseline.tmp"
-echo DMRTest.at:426 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:426"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:426: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \" || true"
-echo DMRTest.at:426 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s[1] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1] \" || true" "DMRTest.at:426"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:426: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:426 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:426"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_146
#AT_START_147
-# 147. DMRTest.at:427: trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base
-at_setup_line='DMRTest.at:427'
-at_desc="trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base"
-$at_quiet $as_echo_n "147: $at_desc"
+at_fn_group_banner 147 'DMRTest.at:427' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "147. DMRTest.at:427: testing ..."
+ $as_echo "147. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18875,111 +14338,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:427: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\""
-echo DMRTest.at:427 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\"" "DMRTest.at:427"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:427: mv stdout \$baseline.tmp"
-echo DMRTest.at:427 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:427"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:427: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\" || true"
-echo DMRTest.at:427 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\" || true" "DMRTest.at:427"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:427: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:427 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:427"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:427"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_147
#AT_START_148
-# 148. DMRTest.at:429: trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base
-at_setup_line='DMRTest.at:429'
-at_desc="trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base"
-$at_quiet $as_echo_n "148: $at_desc"
+at_fn_group_banner 148 'DMRTest.at:429' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "148. DMRTest.at:429: testing ..."
+ $as_echo "148. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18988,111 +14419,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\""
-echo DMRTest.at:429 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\"" "DMRTest.at:429"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:429: mv stdout \$baseline.tmp"
-echo DMRTest.at:429 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:429"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\" || true"
-echo DMRTest.at:429 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\" || true" "DMRTest.at:429"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:429: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:429 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_148
#AT_START_149
-# 149. DMRTest.at:432: trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base
-at_setup_line='DMRTest.at:432'
-at_desc="trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base"
-$at_quiet $as_echo_n "149: $at_desc"
+at_fn_group_banner 149 'DMRTest.at:432' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "149. DMRTest.at:432: testing ..."
+ $as_echo "149. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19101,111 +14500,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\""
-echo DMRTest.at:432 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\"" "DMRTest.at:432"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:432: mv stdout \$baseline.tmp"
-echo DMRTest.at:432 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:432"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\" || true"
-echo DMRTest.at:432 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\" || true" "DMRTest.at:432"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:432: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:432 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_149
#AT_START_150
-# 150. DMRTest.at:433: trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base
-at_setup_line='DMRTest.at:433'
-at_desc="trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base"
-$at_quiet $as_echo_n "150: $at_desc"
+at_fn_group_banner 150 'DMRTest.at:433' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "150. DMRTest.at:433: testing ..."
+ $as_echo "150. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19214,111 +14581,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_8.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\""
-echo DMRTest.at:433 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\"" "DMRTest.at:433"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:433: mv stdout \$baseline.tmp"
-echo DMRTest.at:433 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:433"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\" || true"
-echo DMRTest.at:433 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\" || true" "DMRTest.at:433"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:433: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:433 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_150
#AT_START_151
-# 151. DMRTest.at:436: trans ce test_array_7.1.xml test_array_7.1.xml.1.trans_base
-at_setup_line='DMRTest.at:436'
-at_desc="trans ce test_array_7.1.xml test_array_7.1.xml.1.trans_base"
-$at_quiet $as_echo_n "151: $at_desc"
+at_fn_group_banner 151 'DMRTest.at:436' \
+ "trans ce test_array_7.1.xml test_array_7.1.xml.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "151. DMRTest.at:436: testing ..."
+ $as_echo "151. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19327,111 +14662,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"\""
-echo DMRTest.at:436 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\"" "DMRTest.at:436"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:436: mv stdout \$baseline.tmp"
-echo DMRTest.at:436 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:436"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"\" || true"
-echo DMRTest.at:436 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\" || true" "DMRTest.at:436"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:436: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:436 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_151
#AT_START_152
-# 152. DMRTest.at:437: trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base
-at_setup_line='DMRTest.at:437'
-at_desc="trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base"
-$at_quiet $as_echo_n "152: $at_desc"
+at_fn_group_banner 152 'DMRTest.at:437' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "152. DMRTest.at:437: testing ..."
+ $as_echo "152. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19440,111 +14743,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
-echo DMRTest.at:437 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:437"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:437: mv stdout \$baseline.tmp"
-echo DMRTest.at:437 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:437"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
-echo DMRTest.at:437 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:437"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:437: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:437 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_152
#AT_START_153
-# 153. DMRTest.at:439: trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base
-at_setup_line='DMRTest.at:439'
-at_desc="trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base"
-$at_quiet $as_echo_n "153: $at_desc"
+at_fn_group_banner 153 'DMRTest.at:439' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "153. DMRTest.at:439: testing ..."
+ $as_echo "153. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19553,111 +14824,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:439: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
-echo DMRTest.at:439 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:439"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:439: mv stdout \$baseline.tmp"
-echo DMRTest.at:439 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:439"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:439: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
-echo DMRTest.at:439 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:439"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:439: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:439 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:439"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_153
#AT_START_154
-# 154. DMRTest.at:440: trans ce test_array_7.1.xml s.i1[][] test_array_7.1.xml.2.trans_base
-at_setup_line='DMRTest.at:440'
-at_desc="trans ce test_array_7.1.xml s.i1[][] test_array_7.1.xml.2.trans_base"
-$at_quiet $as_echo_n "154: $at_desc"
+at_fn_group_banner 154 'DMRTest.at:440' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "154. DMRTest.at:440: testing ..."
+ $as_echo "154. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19666,111 +14905,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \""
-echo DMRTest.at:440 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \"" "DMRTest.at:440"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:440: mv stdout \$baseline.tmp"
-echo DMRTest.at:440 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:440"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \" || true"
-echo DMRTest.at:440 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \" || true" "DMRTest.at:440"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:440: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:440 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_154
#AT_START_155
-# 155. DMRTest.at:441: trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base
-at_setup_line='DMRTest.at:441'
-at_desc="trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base"
-$at_quiet $as_echo_n "155: $at_desc"
+at_fn_group_banner 155 'DMRTest.at:441' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "155. DMRTest.at:441: testing ..."
+ $as_echo "155. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19779,111 +14986,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:441: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
-echo DMRTest.at:441 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:441"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:441: mv stdout \$baseline.tmp"
-echo DMRTest.at:441 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:441"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:441: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
-echo DMRTest.at:441 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:441"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:441: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:441 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:441"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_155
#AT_START_156
-# 156. DMRTest.at:442: trans ce test_array_7.1.xml s{i1[][]} test_array_7.1.xml.2.trans_base
-at_setup_line='DMRTest.at:442'
-at_desc="trans ce test_array_7.1.xml s{i1[][]} test_array_7.1.xml.2.trans_base"
-$at_quiet $as_echo_n "156: $at_desc"
+at_fn_group_banner 156 'DMRTest.at:442' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "156. DMRTest.at:442: testing ..."
+ $as_echo "156. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19892,111 +15067,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:442: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \""
-echo DMRTest.at:442 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:442: mv stdout \$baseline.tmp"
-echo DMRTest.at:442 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:442"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:442: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \" || true"
-echo DMRTest.at:442 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:442: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:442 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:442"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_156
#AT_START_157
-# 157. DMRTest.at:444: trans ce test_array_7.1.xml s.i1[0][0] test_array_7.1.xml.3.trans_base
-at_setup_line='DMRTest.at:444'
-at_desc="trans ce test_array_7.1.xml s.i1[0][0] test_array_7.1.xml.3.trans_base"
-$at_quiet $as_echo_n "157: $at_desc"
+at_fn_group_banner 157 'DMRTest.at:444' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "157. DMRTest.at:444: testing ..."
+ $as_echo "157. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20005,111 +15148,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:444: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \""
-echo DMRTest.at:444 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \"" "DMRTest.at:444"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:444: mv stdout \$baseline.tmp"
-echo DMRTest.at:444 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:444"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:444: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \" || true"
-echo DMRTest.at:444 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \" || true" "DMRTest.at:444"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:444: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:444 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:444"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:444"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_157
#AT_START_158
-# 158. DMRTest.at:445: trans ce test_array_7.1.xml s{i1[0][0]} test_array_7.1.xml.3.trans_base
-at_setup_line='DMRTest.at:445'
-at_desc="trans ce test_array_7.1.xml s{i1[0][0]} test_array_7.1.xml.3.trans_base"
-$at_quiet $as_echo_n "158: $at_desc"
+at_fn_group_banner 158 'DMRTest.at:445' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "158. DMRTest.at:445: testing ..."
+ $as_echo "158. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20118,111 +15229,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:445: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \""
-echo DMRTest.at:445 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \"" "DMRTest.at:445"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:445: mv stdout \$baseline.tmp"
-echo DMRTest.at:445 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:445"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:445: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \" || true"
-echo DMRTest.at:445 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \" || true" "DMRTest.at:445"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:445: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:445 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:445"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_158
#AT_START_159
-# 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
-at_setup_line='DMRTest.at:447'
-at_desc="trans ce test_array_7.1.xml s.i1[0:2][1:2] test_array_7.1.xml.4.trans_base"
-$at_quiet $as_echo_n "159: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "159. DMRTest.at:447: testing ..."
+ $as_echo "159. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20231,111 +15310,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:447: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \""
-echo DMRTest.at:447 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \"" "DMRTest.at:447"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:447: mv stdout \$baseline.tmp"
-echo DMRTest.at:447 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:447"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:447: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \" || true"
-echo DMRTest.at:447 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \" || true" "DMRTest.at:447"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:447: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:447 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:447"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_159
#AT_START_160
-# 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
-at_setup_line='DMRTest.at:451'
-at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s test_array_7.1.xml.5.trans_base"
-$at_quiet $as_echo_n "160: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "160. DMRTest.at:451: testing ..."
+ $as_echo "160. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20344,111 +15391,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.5.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \""
-echo DMRTest.at:451 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \"" "DMRTest.at:451"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:451: mv stdout \$baseline.tmp"
-echo DMRTest.at:451 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:451"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:451 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \" || true" "DMRTest.at:451"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:451: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:451 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_160
#AT_START_161
-# 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
-at_setup_line='DMRTest.at:453'
-at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1 test_array_7.1.xml.6.trans_base"
-$at_quiet $as_echo_n "161: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "161. DMRTest.at:453: testing ..."
+ $as_echo "161. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20457,111 +15472,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { 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 \""
-echo DMRTest.at:453 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \"" "DMRTest.at:453"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:453: mv stdout \$baseline.tmp"
-echo DMRTest.at:453 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:453"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:453 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:453: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:453 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:453"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:453"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_161
#AT_START_162
-# 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
-at_setup_line='DMRTest.at:454'
-at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][] test_array_7.1.xml.6.trans_base"
-$at_quiet $as_echo_n "162: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "162. DMRTest.at:454: testing ..."
+ $as_echo "162. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20570,111 +15553,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { 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[][] \""
-echo DMRTest.at:454 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \"" "DMRTest.at:454"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:454: mv stdout \$baseline.tmp"
-echo DMRTest.at:454 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:454"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:454 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:454: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:454 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:454"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:454"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_162
#AT_START_163
-# 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
-at_setup_line='DMRTest.at:455'
-at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1} test_array_7.1.xml.6.trans_base"
-$at_quiet $as_echo_n "163: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "163. DMRTest.at:455: testing ..."
+ $as_echo "163. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20683,111 +15634,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { 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} \""
-echo DMRTest.at:455 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \"" "DMRTest.at:455"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:455: mv stdout \$baseline.tmp"
-echo DMRTest.at:455 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:455"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:455 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:455: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:455 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_163
#AT_START_164
-# 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
-at_setup_line='DMRTest.at:456'
-at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]} test_array_7.1.xml.6.trans_base"
-$at_quiet $as_echo_n "164: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "164. DMRTest.at:456: testing ..."
+ $as_echo "164. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20796,111 +15715,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { 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[][]} \""
-echo DMRTest.at:456 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \"" "DMRTest.at:456"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:456: mv stdout \$baseline.tmp"
-echo DMRTest.at:456 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:456"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:456 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:456: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:456 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_164
#AT_START_165
-# 165. DMRTest.at:459: trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base
-at_setup_line='DMRTest.at:459'
-at_desc="trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base"
-$at_quiet $as_echo_n "165: $at_desc"
+at_fn_group_banner 165 'DMRTest.at:459' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "165. DMRTest.at:459: testing ..."
+ $as_echo "165. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20909,111 +15796,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\""
-echo DMRTest.at:459 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\"" "DMRTest.at:459"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:459: mv stdout \$baseline.tmp"
-echo DMRTest.at:459 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:459"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\" || true"
-echo DMRTest.at:459 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\" || true" "DMRTest.at:459"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:459: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:459 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_165
#AT_START_166
-# 166. DMRTest.at:460: trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base
-at_setup_line='DMRTest.at:460'
-at_desc="trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base"
-$at_quiet $as_echo_n "166: $at_desc"
+at_fn_group_banner 166 'DMRTest.at:460' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "166. DMRTest.at:460: testing ..."
+ $as_echo "166. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21022,111 +15877,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\""
-echo DMRTest.at:460 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\"" "DMRTest.at:460"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:460: mv stdout \$baseline.tmp"
-echo DMRTest.at:460 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:460"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\" || true"
-echo DMRTest.at:460 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\" || true" "DMRTest.at:460"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:460: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:460 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_166
#AT_START_167
-# 167. DMRTest.at:461: trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base
-at_setup_line='DMRTest.at:461'
-at_desc="trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base"
-$at_quiet $as_echo_n "167: $at_desc"
+at_fn_group_banner 167 'DMRTest.at:461' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "167. DMRTest.at:461: testing ..."
+ $as_echo "167. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21135,111 +15958,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:461: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\""
-echo DMRTest.at:461 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\"" "DMRTest.at:461"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:461: mv stdout \$baseline.tmp"
-echo DMRTest.at:461 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:461"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:461: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\" || true"
-echo DMRTest.at:461 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\" || true" "DMRTest.at:461"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:461: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:461 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:461"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_167
#AT_START_168
-# 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
-at_setup_line='DMRTest.at:463'
-at_desc="trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base"
-$at_quiet $as_echo_n "168: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "168. DMRTest.at:463: testing ..."
+ $as_echo "168. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21248,111 +16039,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\""
-echo DMRTest.at:463 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\"" "DMRTest.at:463"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:463: mv stdout \$baseline.tmp"
-echo DMRTest.at:463 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:463"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\" || true"
-echo DMRTest.at:463 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\" || true" "DMRTest.at:463"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:463: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:463 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_168
#AT_START_169
-# 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
-at_setup_line='DMRTest.at:464'
-at_desc="trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base"
-$at_quiet $as_echo_n "169: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "169. DMRTest.at:464: testing ..."
+ $as_echo "169. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21361,111 +16120,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:464: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\""
-echo DMRTest.at:464 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\"" "DMRTest.at:464"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:464: mv stdout \$baseline.tmp"
-echo DMRTest.at:464 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:464"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:464: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\" || true"
-echo DMRTest.at:464 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\" || true" "DMRTest.at:464"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:464: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:464 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:464"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_169
#AT_START_170
-# 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
-at_setup_line='DMRTest.at:466'
-at_desc="trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base"
-$at_quiet $as_echo_n "170: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "170. DMRTest.at:466: testing ..."
+ $as_echo "170. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21474,111 +16201,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:466: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\""
-echo DMRTest.at:466 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\"" "DMRTest.at:466"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:466: mv stdout \$baseline.tmp"
-echo DMRTest.at:466 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:466"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:466: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\" || true"
-echo DMRTest.at:466 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\" || true" "DMRTest.at:466"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:466: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:466 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:466"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_170
#AT_START_171
-# 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
-at_setup_line='DMRTest.at:467'
-at_desc="trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base"
-$at_quiet $as_echo_n "171: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "171. DMRTest.at:467: testing ..."
+ $as_echo "171. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21587,111 +16282,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:467: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\""
-echo DMRTest.at:467 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\"" "DMRTest.at:467"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:467: mv stdout \$baseline.tmp"
-echo DMRTest.at:467 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:467"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:467: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\" || true"
-echo DMRTest.at:467 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\" || true" "DMRTest.at:467"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:467: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:467 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:467"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:467"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_171
#AT_START_172
-# 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
-at_setup_line='DMRTest.at:469'
-at_desc="trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base"
-$at_quiet $as_echo_n "172: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "172. DMRTest.at:469: testing ..."
+ $as_echo "172. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21700,111 +16363,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:469: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\""
-echo DMRTest.at:469 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\"" "DMRTest.at:469"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:469: mv stdout \$baseline.tmp"
-echo DMRTest.at:469 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:469"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { 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"
-echo DMRTest.at:469 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\" || true" "DMRTest.at:469"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:469: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:469 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:469"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_172
#AT_START_173
-# 173. DMRTest.at:473: trans test_array_1.xml scale(x,1) test_array_1.xml.1.func_base
-at_setup_line='DMRTest.at:473'
-at_desc="trans test_array_1.xml scale(x,1) test_array_1.xml.1.func_base"
-$at_quiet $as_echo_n "173: $at_desc"
+at_fn_group_banner 173 'DMRTest.at:473' \
+ "trans test_array_1.xml scale(x,1) test_array_1.xml.1.func_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "173. DMRTest.at:473: testing ..."
+ $as_echo "173. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21814,111 +16445,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.1.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:473 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:473"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:473: mv stdout \$baseline.tmp"
-echo DMRTest.at:473 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:473"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:473 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:473"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:473: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:473 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_173
#AT_START_174
-# 174. DMRTest.at:474: trans test_array_1.xml scale(x,10) test_array_1.xml.2.func_base
-at_setup_line='DMRTest.at:474'
-at_desc="trans test_array_1.xml scale(x,10) test_array_1.xml.2.func_base"
-$at_quiet $as_echo_n "174: $at_desc"
+at_fn_group_banner 174 'DMRTest.at:474' \
+ "trans test_array_1.xml scale(x,10) test_array_1.xml.2.func_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "174. DMRTest.at:474: testing ..."
+ $as_echo "174. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21928,111 +16527,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.2.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:474: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:474 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:474"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:474: mv stdout \$baseline.tmp"
-echo DMRTest.at:474 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:474"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:474: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:474 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:474"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:474: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:474 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:474"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_174
#AT_START_175
-# 175. DMRTest.at:475: trans test_array_1.xml scale(x,-10) test_array_1.xml.3.func_base
-at_setup_line='DMRTest.at:475'
-at_desc="trans test_array_1.xml scale(x,-10) test_array_1.xml.3.func_base"
-$at_quiet $as_echo_n "175: $at_desc"
+at_fn_group_banner 175 'DMRTest.at:475' \
+ "trans test_array_1.xml scale(x,-10) test_array_1.xml.3.func_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "175. DMRTest.at:475: testing ..."
+ $as_echo "175. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22042,111 +16609,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.3.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:475: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:475 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:475"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:475: mv stdout \$baseline.tmp"
-echo DMRTest.at:475 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:475"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:475: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:475 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:475"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:475: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:475 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:475"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_175
#AT_START_176
-# 176. DMRTest.at:476: trans test_array_1.xml scale(x,0.001) test_array_1.xml.4.func_base
-at_setup_line='DMRTest.at:476'
-at_desc="trans test_array_1.xml scale(x,0.001) test_array_1.xml.4.func_base"
-$at_quiet $as_echo_n "176: $at_desc"
+at_fn_group_banner 176 'DMRTest.at:476' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "176. DMRTest.at:476: testing ..."
+ $as_echo "176. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22156,111 +16691,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.4.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:476: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:476 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:476"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:476: mv stdout \$baseline.tmp"
-echo DMRTest.at:476 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:476"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:476: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:476 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:476"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:476: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:476 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:476"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:476"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_176
#AT_START_177
-# 177. DMRTest.at:477: trans test_array_1.xml scale(x,-0.001) test_array_1.xml.5.func_base
-at_setup_line='DMRTest.at:477'
-at_desc="trans test_array_1.xml scale(x,-0.001) test_array_1.xml.5.func_base"
-$at_quiet $as_echo_n "177: $at_desc"
+at_fn_group_banner 177 'DMRTest.at:477' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "177. DMRTest.at:477: testing ..."
+ $as_echo "177. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22270,111 +16773,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.5.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:477: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:477 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:477"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:477: mv stdout \$baseline.tmp"
-echo DMRTest.at:477 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:477"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:477: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:477 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:477"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:477: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:477 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:477"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_177
#AT_START_178
-# 178. DMRTest.at:481: trans test_array_1.xml scale(x,0x7fffffffffffffff) test_array_1.xml.6.func_base
-at_setup_line='DMRTest.at:481'
-at_desc="trans test_array_1.xml scale(x,0x7fffffffffffffff) test_array_1.xml.6.func_base"
-$at_quiet $as_echo_n "178: $at_desc"
+at_fn_group_banner 178 'DMRTest.at:481' \
+ "trans test_array_1.xml scale(x,0x7fffffffffffffff) test_array_1.xml.6.func_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "178. DMRTest.at:481: testing ..."
+ $as_echo "178. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22384,111 +16855,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.6.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:481: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:481 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:481"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:481: mv stdout \$baseline.tmp"
-echo DMRTest.at:481 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:481"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:481: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:481 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:481"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:481: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:481 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:481"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:481"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_178
#AT_START_179
-# 179. DMRTest.at:483: trans test_array_1.xml scale(x,0x8fffffffffffffff) test_array_1.xml.7.func_base
-at_setup_line='DMRTest.at:483'
-at_desc="trans test_array_1.xml scale(x,0x8fffffffffffffff) test_array_1.xml.7.func_base"
-$at_quiet $as_echo_n "179: $at_desc"
+at_fn_group_banner 179 'DMRTest.at:483' \
+ "trans test_array_1.xml scale(x,0x8fffffffffffffff) test_array_1.xml.7.func_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "179. DMRTest.at:483: testing ..."
+ $as_echo "179. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22498,111 +16937,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.7.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:483 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:483"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:483: mv stdout \$baseline.tmp"
-echo DMRTest.at:483 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:483"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:483 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:483"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:483: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:483 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_179
#AT_START_180
-# 180. DMRTest.at:487: trans test_array_5.xml scale(a,0.001) test_array_5.xml.1.func_base
-at_setup_line='DMRTest.at:487'
-at_desc="trans test_array_5.xml scale(a,0.001) test_array_5.xml.1.func_base"
-$at_quiet $as_echo_n "180: $at_desc"
+at_fn_group_banner 180 'DMRTest.at:487' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "180. DMRTest.at:487: testing ..."
+ $as_echo "180. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22612,111 +17019,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.1.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:487: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:487 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:487"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:487: mv stdout \$baseline.tmp"
-echo DMRTest.at:487 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:487"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:487: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:487 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:487"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:487: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:487 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:487"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_180
#AT_START_181
-# 181. DMRTest.at:488: trans test_array_5.xml scale(b,0.001) test_array_5.xml.2.func_base
-at_setup_line='DMRTest.at:488'
-at_desc="trans test_array_5.xml scale(b,0.001) test_array_5.xml.2.func_base"
-$at_quiet $as_echo_n "181: $at_desc"
+at_fn_group_banner 181 'DMRTest.at:488' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "181. DMRTest.at:488: testing ..."
+ $as_echo "181. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22726,111 +17101,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.2.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:488: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:488 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:488"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:488: mv stdout \$baseline.tmp"
-echo DMRTest.at:488 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:488"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:488: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:488 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:488"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:488: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:488 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:488"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_181
#AT_START_182
-# 182. DMRTest.at:490: trans test_array_5.xml scale(c,0.001) test_array_5.xml.3.func_base
-at_setup_line='DMRTest.at:490'
-at_desc="trans test_array_5.xml scale(c,0.001) test_array_5.xml.3.func_base"
-$at_quiet $as_echo_n "182: $at_desc"
+at_fn_group_banner 182 'DMRTest.at:490' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "182. DMRTest.at:490: testing ..."
+ $as_echo "182. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22840,111 +17183,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.3.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:490: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:490 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:490"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:490: mv stdout \$baseline.tmp"
-echo DMRTest.at:490 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:490"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:490: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:490 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:490"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:490: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:490 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:490"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:490"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_182
#AT_START_183
-# 183. DMRTest.at:491: trans test_array_5.xml scale(d,0.001) test_array_5.xml.4.func_base
-at_setup_line='DMRTest.at:491'
-at_desc="trans test_array_5.xml scale(d,0.001) test_array_5.xml.4.func_base"
-$at_quiet $as_echo_n "183: $at_desc"
+at_fn_group_banner 183 'DMRTest.at:491' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "183. DMRTest.at:491: testing ..."
+ $as_echo "183. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22954,111 +17265,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.4.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:491: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:491 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:491"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:491: mv stdout \$baseline.tmp"
-echo DMRTest.at:491 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:491"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:491: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:491 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:491"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:491: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:491 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:491"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:491"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_183
#AT_START_184
-# 184. DMRTest.at:496: trans vol_1_ce_1.xml scale(u,10) vol_1_ce_1.xml.1.func_base
-at_setup_line='DMRTest.at:496'
-at_desc="trans vol_1_ce_1.xml scale(u,10) vol_1_ce_1.xml.1.func_base"
-$at_quiet $as_echo_n "184: $at_desc"
+at_fn_group_banner 184 'DMRTest.at:496' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "184. DMRTest.at:496: testing ..."
+ $as_echo "184. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23068,111 +17347,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.1.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:496: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:496 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:496: mv stdout \$baseline.tmp"
-echo DMRTest.at:496 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:496"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:496: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:496 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:496: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:496 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:496"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_184
#AT_START_185
-# 185. DMRTest.at:497: trans vol_1_ce_1.xml scale(u,v) vol_1_ce_1.xml.2.func_base
-at_setup_line='DMRTest.at:497'
-at_desc="trans vol_1_ce_1.xml scale(u,v) vol_1_ce_1.xml.2.func_base"
-$at_quiet $as_echo_n "185: $at_desc"
+at_fn_group_banner 185 'DMRTest.at:497' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "185. DMRTest.at:497: testing ..."
+ $as_echo "185. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23182,111 +17429,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.2.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:497: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:497 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:497"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:497: mv stdout \$baseline.tmp"
-echo DMRTest.at:497 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:497"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:497: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:497 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:497"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:497: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:497 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:497"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_185
#AT_START_186
-# 186. DMRTest.at:498: trans vol_1_ce_1.xml scale(scale(u,10),0.01) vol_1_ce_1.xml.3.func_base
-at_setup_line='DMRTest.at:498'
-at_desc="trans vol_1_ce_1.xml scale(scale(u,10),0.01) vol_1_ce_1.xml.3.func_base"
-$at_quiet $as_echo_n "186: $at_desc"
+at_fn_group_banner 186 'DMRTest.at:498' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "186. DMRTest.at:498: testing ..."
+ $as_echo "186. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23296,111 +17511,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.3.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:498: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:498 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:498"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:498: mv stdout \$baseline.tmp"
-echo DMRTest.at:498 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:498"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:498: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:498 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:498"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:498: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:498 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:498"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_186
#AT_START_187
-# 187. DMRTest.at:501: trans vol_1_ce_1.xml scale(Point.x,10) vol_1_ce_1.xml.4.func_base
-at_setup_line='DMRTest.at:501'
-at_desc="trans vol_1_ce_1.xml scale(Point.x,10) vol_1_ce_1.xml.4.func_base"
-$at_quiet $as_echo_n "187: $at_desc"
+at_fn_group_banner 187 'DMRTest.at:501' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "187. DMRTest.at:501: testing ..."
+ $as_echo "187. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23410,111 +17593,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.4.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:501: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:501 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:501"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:501: mv stdout \$baseline.tmp"
-echo DMRTest.at:501 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:501"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:501: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:501 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:501"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:501: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:501 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:501"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:501"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_187
#AT_START_188
-# 188. DMRTest.at:502: trans vol_1_ce_1.xml scale(Point.x,Point.y) vol_1_ce_1.xml.5.func_base
-at_setup_line='DMRTest.at:502'
-at_desc="trans vol_1_ce_1.xml scale(Point.x,Point.y) vol_1_ce_1.xml.5.func_base"
-$at_quiet $as_echo_n "188: $at_desc"
+at_fn_group_banner 188 'DMRTest.at:502' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "188. DMRTest.at:502: testing ..."
+ $as_echo "188. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23524,111 +17675,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.5.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:502 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:502: mv stdout \$baseline.tmp"
-echo DMRTest.at:502 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:502"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:502 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:502: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:502 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_188
#AT_START_189
-# 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
-at_setup_line='DMRTest.at:503'
-at_desc="trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01) vol_1_ce_1.xml.6.func_base"
-$at_quiet $as_echo_n "189: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "189. DMRTest.at:503: testing ..."
+ $as_echo "189. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23638,111 +17757,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.6.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:503: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:503 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:503"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:503: mv stdout \$baseline.tmp"
-echo DMRTest.at:503 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:503"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:503: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:503 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:503"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:503: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:503 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:503"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_189
#AT_START_190
-# 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
-at_setup_line='DMRTest.at:506'
-at_desc="trans vol_1_ce_1.xml scale(\\\$Byte(20:1,2,3,4),10) vol_1_ce_1.xml.7.func_base"
-$at_quiet $as_echo_n "190: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "190. DMRTest.at:506: testing ..."
+ $as_echo "190. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23752,111 +17839,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.7.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:506 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:506: mv stdout \$baseline.tmp"
-echo DMRTest.at:506 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:506"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:506 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/DMRTest.at:506: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:506 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
-
-$at_failed && at_func_log_failure
+ { 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"
+( $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_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_190
#AT_START_191
-# 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
-at_setup_line='DMRTest.at:507'
-at_desc="trans vol_1_ce_1.xml scale(\\\$Int8(20:10,11,12,-9),10) vol_1_ce_1.xml.8.func_base"
-$at_quiet $as_echo_n "191: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "191. DMRTest.at:507: testing ..."
+ $as_echo "191. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23866,111 +17921,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.8.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:507 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:507: mv stdout \$baseline.tmp"
-echo DMRTest.at:507 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:507"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:507 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:507: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:507 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_191
#AT_START_192
-# 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
-at_setup_line='DMRTest.at:508'
-at_desc="trans vol_1_ce_1.xml scale(\\\$UInt16(20:1,2,3,4),10) vol_1_ce_1.xml.9.func_base"
-$at_quiet $as_echo_n "192: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "192. DMRTest.at:508: testing ..."
+ $as_echo "192. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23980,111 +18003,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.9.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:508: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:508 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:508"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:508: mv stdout \$baseline.tmp"
-echo DMRTest.at:508 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:508"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:508: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:508 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:508"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:508: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:508 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:508"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_192
#AT_START_193
-# 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
-at_setup_line='DMRTest.at:509'
-at_desc="trans vol_1_ce_1.xml scale(\\\$Int16(20:1,2,3,-4),10) vol_1_ce_1.xml.10.func_base"
-$at_quiet $as_echo_n "193: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "193. DMRTest.at:509: testing ..."
+ $as_echo "193. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24094,111 +18085,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.10.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:509 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:509: mv stdout \$baseline.tmp"
-echo DMRTest.at:509 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:509"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:509 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:509: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:509 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_193
#AT_START_194
-# 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
-at_setup_line='DMRTest.at:510'
-at_desc="trans vol_1_ce_1.xml scale(\\\$UInt32(20:1,2,3,4),10) vol_1_ce_1.xml.11.func_base"
-$at_quiet $as_echo_n "194: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "194. DMRTest.at:510: testing ..."
+ $as_echo "194. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24208,111 +18167,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.11.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:510 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:510: mv stdout \$baseline.tmp"
-echo DMRTest.at:510 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:510"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:510 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:510: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:510 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_194
#AT_START_195
-# 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
-at_setup_line='DMRTest.at:511'
-at_desc="trans vol_1_ce_1.xml scale(\\\$Int32(20:1,2,3,-4),10) vol_1_ce_1.xml.12.func_base"
-$at_quiet $as_echo_n "195: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "195. DMRTest.at:511: testing ..."
+ $as_echo "195. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24322,111 +18249,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.12.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:511: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:511 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:511"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:511: mv stdout \$baseline.tmp"
-echo DMRTest.at:511 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:511"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:511: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:511 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:511"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:511: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:511 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:511"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_195
#AT_START_196
-# 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
-at_setup_line='DMRTest.at:512'
-at_desc="trans vol_1_ce_1.xml scale(\\\$UInt64(20:1,2,3,0xffffffffffffffff),1) vol_1_ce_1.xml.13.func_base"
-$at_quiet $as_echo_n "196: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "196. DMRTest.at:512: testing ..."
+ $as_echo "196. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24436,111 +18331,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.13.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:512: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:512 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:512"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:512: mv stdout \$baseline.tmp"
-echo DMRTest.at:512 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:512"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:512: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:512 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:512"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:512: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:512 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:512"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:512"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_196
#AT_START_197
-# 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
-at_setup_line='DMRTest.at:513'
-at_desc="trans vol_1_ce_1.xml scale(\\\$Int64(20:1,2,3,0x7fffffffffffffff),1) vol_1_ce_1.xml.14.func_base"
-$at_quiet $as_echo_n "197: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "197. DMRTest.at:513: testing ..."
+ $as_echo "197. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24550,111 +18413,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.14.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:513: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:513 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:513"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:513: mv stdout \$baseline.tmp"
-echo DMRTest.at:513 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:513"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:513: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:513 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:513"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:513: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:513 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:513"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:513"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_197
#AT_START_198
-# 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
-at_setup_line='DMRTest.at:514'
-at_desc="trans vol_1_ce_1.xml scale(\\\$Float32(20:1,2,3,4.55),10) vol_1_ce_1.xml.15.func_base"
-$at_quiet $as_echo_n "198: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "198. DMRTest.at:514: testing ..."
+ $as_echo "198. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24664,111 +18495,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.15.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:514: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:514 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:514"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:514: mv stdout \$baseline.tmp"
-echo DMRTest.at:514 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:514"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:514: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:514 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:514"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:514: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:514 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:514"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:514"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_198
#AT_START_199
-# 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
-at_setup_line='DMRTest.at:515'
-at_desc="trans vol_1_ce_1.xml scale(\\\$Float64(20:1,2,3,4.55),10) vol_1_ce_1.xml.16.func_base"
-$at_quiet $as_echo_n "199: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "199. DMRTest.at:515: testing ..."
+ $as_echo "199. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24778,111 +18577,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.16.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:515 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:515: mv stdout \$baseline.tmp"
-echo DMRTest.at:515 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:515"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:515 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:515: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:515 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_199
#AT_START_200
-# 200. DMRTest.at:519: trans vol_1_ce_10.xml scale(lat,10) vol_1_ce_10.xml.1.func_base
-at_setup_line='DMRTest.at:519'
-at_desc="trans vol_1_ce_10.xml scale(lat,10) vol_1_ce_10.xml.1.func_base"
-$at_quiet $as_echo_n "200: $at_desc"
+at_fn_group_banner 200 'DMRTest.at:519' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "200. DMRTest.at:519: testing ..."
+ $as_echo "200. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24892,111 +18659,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.1.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:519: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:519 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:519"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:519: mv stdout \$baseline.tmp"
-echo DMRTest.at:519 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:519"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:519: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:519 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:519"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:519: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:519 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:519"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:519"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_200
#AT_START_201
-# 201. DMRTest.at:520: trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) vol_1_ce_10.xml.2.func_base
-at_setup_line='DMRTest.at:520'
-at_desc="trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) vol_1_ce_10.xml.2.func_base"
-$at_quiet $as_echo_n "201: $at_desc"
+at_fn_group_banner 201 'DMRTest.at:520' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "201. DMRTest.at:520: testing ..."
+ $as_echo "201. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25006,111 +18741,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce=""
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.2.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:520: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:520 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:520: mv stdout \$baseline.tmp"
-echo DMRTest.at:520 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:520"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:520: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:520 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:520: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:520 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:520"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_201
#AT_START_202
-# 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
-at_setup_line='DMRTest.at:521'
-at_desc="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_quiet $as_echo_n "202: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "202. DMRTest.at:521: testing ..."
+ $as_echo "202. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25120,111 +18823,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="lat[10:11][10:11];lon[10:11][10:11]"
baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.3.func_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:521: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-echo DMRTest.at:521 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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 stdout:; tee stdout <"$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:521: mv stdout \$baseline.tmp"
-echo DMRTest.at:521 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:521"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:521: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-echo DMRTest.at:521 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
- ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:521: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-echo DMRTest.at:521 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
- ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:521"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_202
#AT_START_203
-# 203. DMRTest.at:528: filter test_simple_7.xml s test_simple_7.xml.f.trans_base
-at_setup_line='DMRTest.at:528'
-at_desc="filter test_simple_7.xml s test_simple_7.xml.f.trans_base"
-$at_quiet $as_echo_n "203: $at_desc"
+at_fn_group_banner 203 'DMRTest.at:528' \
+ "filter test_simple_7.xml s test_simple_7.xml.f.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "203. DMRTest.at:528: testing ..."
+ $as_echo "203. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25233,111 +18904,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:528 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:528"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:528: mv stdout \$baseline.tmp"
-echo DMRTest.at:528 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:528"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:528 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:528"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:528: diff -b -B \$baseline stdout"
-echo DMRTest.at:528 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:528"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_203
#AT_START_204
-# 204. DMRTest.at:530: filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base
-at_setup_line='DMRTest.at:530'
-at_desc="filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base"
-$at_quiet $as_echo_n "204: $at_desc"
+at_fn_group_banner 204 'DMRTest.at:530' \
+ "filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "204. DMRTest.at:530: testing ..."
+ $as_echo "204. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25346,111 +18985,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|i1==1024"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:530 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:530"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:530: mv stdout \$baseline.tmp"
-echo DMRTest.at:530 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:530"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:530 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:530"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:530: diff -b -B \$baseline stdout"
-echo DMRTest.at:530 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:530"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_204
#AT_START_205
-# 205. DMRTest.at:531: filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base
-at_setup_line='DMRTest.at:531'
-at_desc="filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base"
-$at_quiet $as_echo_n "205: $at_desc"
+at_fn_group_banner 205 'DMRTest.at:531' \
+ "filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "205. DMRTest.at:531: testing ..."
+ $as_echo "205. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25459,111 +19066,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|i1!=1024"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:531 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:531"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:531: mv stdout \$baseline.tmp"
-echo DMRTest.at:531 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:531"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:531 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:531"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:531: diff -b -B \$baseline stdout"
-echo DMRTest.at:531 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:531"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_205
#AT_START_206
-# 206. DMRTest.at:532: filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base
-at_setup_line='DMRTest.at:532'
-at_desc="filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base"
-$at_quiet $as_echo_n "206: $at_desc"
+at_fn_group_banner 206 'DMRTest.at:532' \
+ "filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "206. DMRTest.at:532: testing ..."
+ $as_echo "206. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25572,111 +19147,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|i1<=1024"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:532 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:532"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:532: mv stdout \$baseline.tmp"
-echo DMRTest.at:532 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:532"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:532 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:532"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:532: diff -b -B \$baseline stdout"
-echo DMRTest.at:532 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:532"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_206
#AT_START_207
-# 207. DMRTest.at:533: filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base
-at_setup_line='DMRTest.at:533'
-at_desc="filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base"
-$at_quiet $as_echo_n "207: $at_desc"
+at_fn_group_banner 207 'DMRTest.at:533' \
+ "filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "207. DMRTest.at:533: testing ..."
+ $as_echo "207. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25685,111 +19228,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|i1<1024"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:533: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:533 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:533"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:533: mv stdout \$baseline.tmp"
-echo DMRTest.at:533 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:533"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:533: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:533 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:533"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:533: diff -b -B \$baseline stdout"
-echo DMRTest.at:533 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:533"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:533"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_207
#AT_START_208
-# 208. DMRTest.at:534: filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base
-at_setup_line='DMRTest.at:534'
-at_desc="filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base"
-$at_quiet $as_echo_n "208: $at_desc"
+at_fn_group_banner 208 'DMRTest.at:534' \
+ "filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "208. DMRTest.at:534: testing ..."
+ $as_echo "208. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25798,111 +19309,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|i1<=1024"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f5.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:534 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:534"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:534: mv stdout \$baseline.tmp"
-echo DMRTest.at:534 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:534"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:534 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:534"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:534: diff -b -B \$baseline stdout"
-echo DMRTest.at:534 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:534"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_208
#AT_START_209
-# 209. DMRTest.at:535: filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base
-at_setup_line='DMRTest.at:535'
-at_desc="filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base"
-$at_quiet $as_echo_n "209: $at_desc"
+at_fn_group_banner 209 'DMRTest.at:535' \
+ "filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "209. DMRTest.at:535: testing ..."
+ $as_echo "209. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25911,111 +19390,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|i1>1024"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f6.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:535: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:535 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:535"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:535: mv stdout \$baseline.tmp"
-echo DMRTest.at:535 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:535"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:535: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:535 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:535"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:535: diff -b -B \$baseline stdout"
-echo DMRTest.at:535 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:535"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_209
#AT_START_210
-# 210. DMRTest.at:536: filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base
-at_setup_line='DMRTest.at:536'
-at_desc="filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base"
-$at_quiet $as_echo_n "210: $at_desc"
+at_fn_group_banner 210 'DMRTest.at:536' \
+ "filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "210. DMRTest.at:536: testing ..."
+ $as_echo "210. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26024,111 +19471,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|i1>=1024"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f7.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:536: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:536 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:536"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:536: mv stdout \$baseline.tmp"
-echo DMRTest.at:536 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:536"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:536: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:536 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:536"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:536: diff -b -B \$baseline stdout"
-echo DMRTest.at:536 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:536"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_210
#AT_START_211
-# 211. DMRTest.at:538: filter test_simple_7.xml s|1024<i1 test_simple_7.xml.f8.trans_base
-at_setup_line='DMRTest.at:538'
-at_desc="filter test_simple_7.xml s|1024<i1 test_simple_7.xml.f8.trans_base"
-$at_quiet $as_echo_n "211: $at_desc"
+at_fn_group_banner 211 'DMRTest.at:538' \
+ "filter test_simple_7.xml s|1024<i1 test_simple_7.xml.f8.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "211. DMRTest.at:538: testing ..."
+ $as_echo "211. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26137,111 +19552,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|1024<i1"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f8.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:538 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:538"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:538: mv stdout \$baseline.tmp"
-echo DMRTest.at:538 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:538"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:538 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:538"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:538: diff -b -B \$baseline stdout"
-echo DMRTest.at:538 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:538"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_211
#AT_START_212
-# 212. DMRTest.at:539: filter test_simple_7.xml s|1024<=i1<=32768 test_simple_7.xml.f9.trans_base
-at_setup_line='DMRTest.at:539'
-at_desc="filter test_simple_7.xml s|1024<=i1<=32768 test_simple_7.xml.f9.trans_base"
-$at_quiet $as_echo_n "212: $at_desc"
+at_fn_group_banner 212 'DMRTest.at:539' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "212. DMRTest.at:539: testing ..."
+ $as_echo "212. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26250,111 +19633,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|1024<=i1<=32768"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f9.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:539 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:539"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:539: mv stdout \$baseline.tmp"
-echo DMRTest.at:539 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:539"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:539 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:539"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:539: diff -b -B \$baseline stdout"
-echo DMRTest.at:539 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:539"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_212
#AT_START_213
-# 213. DMRTest.at:540: filter test_simple_7.xml s|i1>=1024.0 test_simple_7.xml.fa.trans_base
-at_setup_line='DMRTest.at:540'
-at_desc="filter test_simple_7.xml s|i1>=1024.0 test_simple_7.xml.fa.trans_base"
-$at_quiet $as_echo_n "213: $at_desc"
+at_fn_group_banner 213 'DMRTest.at:540' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "213. DMRTest.at:540: testing ..."
+ $as_echo "213. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26363,111 +19714,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|i1>=1024.0"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fa.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:540 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:540"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:540: mv stdout \$baseline.tmp"
-echo DMRTest.at:540 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:540"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:540 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:540"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:540: diff -b -B \$baseline stdout"
-echo DMRTest.at:540 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:540"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_213
#AT_START_214
-# 214. DMRTest.at:542: filter test_simple_7.xml s|s==\"Silly test string: 2\" test_simple_7.xml.fs1.trans_base
-at_setup_line='DMRTest.at:542'
-at_desc="filter test_simple_7.xml s|s==\\\"Silly test string: 2\\\" test_simple_7.xml.fs1.trans_base"
-$at_quiet $as_echo_n "214: $at_desc"
+at_fn_group_banner 214 'DMRTest.at:542' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "214. DMRTest.at:542: testing ..."
+ $as_echo "214. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26476,111 +19795,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|s==\"Silly test string: 2\""
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:542: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:542 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:542"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:542: mv stdout \$baseline.tmp"
-echo DMRTest.at:542 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:542"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:542: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:542 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:542"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:542: diff -b -B \$baseline stdout"
-echo DMRTest.at:542 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:542"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_214
#AT_START_215
-# 215. DMRTest.at:543: filter test_simple_7.xml s|s!=\"Silly test string: 2\" test_simple_7.xml.fs2.trans_base
-at_setup_line='DMRTest.at:543'
-at_desc="filter test_simple_7.xml s|s!=\\\"Silly test string: 2\\\" test_simple_7.xml.fs2.trans_base"
-$at_quiet $as_echo_n "215: $at_desc"
+at_fn_group_banner 215 'DMRTest.at:543' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "215. DMRTest.at:543: testing ..."
+ $as_echo "215. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26589,111 +19876,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|s!=\"Silly test string: 2\""
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:543: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:543 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:543"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:543: mv stdout \$baseline.tmp"
-echo DMRTest.at:543 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:543"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:543: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:543 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:543"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:543: diff -b -B \$baseline stdout"
-echo DMRTest.at:543 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:543"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_215
#AT_START_216
-# 216. DMRTest.at:544: filter test_simple_7.xml s|s<\"Silly test string: 2\" test_simple_7.xml.fs3.trans_base
-at_setup_line='DMRTest.at:544'
-at_desc="filter test_simple_7.xml s|s<\\\"Silly test string: 2\\\" test_simple_7.xml.fs3.trans_base"
-$at_quiet $as_echo_n "216: $at_desc"
+at_fn_group_banner 216 'DMRTest.at:544' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "216. DMRTest.at:544: testing ..."
+ $as_echo "216. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26702,111 +19957,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|s<\"Silly test string: 2\""
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:544: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:544 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:544"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:544: mv stdout \$baseline.tmp"
-echo DMRTest.at:544 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:544"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:544: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:544 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:544"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:544: diff -b -B \$baseline stdout"
-echo DMRTest.at:544 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:544"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_216
#AT_START_217
-# 217. DMRTest.at:545: filter test_simple_7.xml s|s<=\"Silly test string: 2\" test_simple_7.xml.fs4.trans_base
-at_setup_line='DMRTest.at:545'
-at_desc="filter test_simple_7.xml s|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.fs4.trans_base"
-$at_quiet $as_echo_n "217: $at_desc"
+at_fn_group_banner 217 'DMRTest.at:545' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "217. DMRTest.at:545: testing ..."
+ $as_echo "217. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26815,111 +20038,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|s<=\"Silly test string: 2\""
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:545: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:545 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:545"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:545: mv stdout \$baseline.tmp"
-echo DMRTest.at:545 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:545"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:545: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:545 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:545"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:545: diff -b -B \$baseline stdout"
-echo DMRTest.at:545 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:545"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:545"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_217
#AT_START_218
-# 218. DMRTest.at:546: filter test_simple_7.xml s|s>\"Silly test string: 2\" test_simple_7.xml.fs5.trans_base
-at_setup_line='DMRTest.at:546'
-at_desc="filter test_simple_7.xml s|s>\\\"Silly test string: 2\\\" test_simple_7.xml.fs5.trans_base"
-$at_quiet $as_echo_n "218: $at_desc"
+at_fn_group_banner 218 'DMRTest.at:546' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "218. DMRTest.at:546: testing ..."
+ $as_echo "218. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26928,111 +20119,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|s>\"Silly test string: 2\""
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs5.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:546: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:546 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:546"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:546: mv stdout \$baseline.tmp"
-echo DMRTest.at:546 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:546"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:546: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:546 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:546"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:546: diff -b -B \$baseline stdout"
-echo DMRTest.at:546 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:546"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:546"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_218
#AT_START_219
-# 219. DMRTest.at:547: filter test_simple_7.xml s|s>=\"Silly test string: 2\" test_simple_7.xml.fs6.trans_base
-at_setup_line='DMRTest.at:547'
-at_desc="filter test_simple_7.xml s|s>=\\\"Silly test string: 2\\\" test_simple_7.xml.fs6.trans_base"
-$at_quiet $as_echo_n "219: $at_desc"
+at_fn_group_banner 219 'DMRTest.at:547' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "219. DMRTest.at:547: testing ..."
+ $as_echo "219. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27041,111 +20200,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|s>=\"Silly test string: 2\""
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs6.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:547: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:547 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:547: mv stdout \$baseline.tmp"
-echo DMRTest.at:547 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:547"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:547: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:547 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:547: diff -b -B \$baseline stdout"
-echo DMRTest.at:547 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:547"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_219
#AT_START_220
-# 220. DMRTest.at:548: filter test_simple_7.xml s|s~=\".*2\" test_simple_7.xml.fs7.trans_base
-at_setup_line='DMRTest.at:548'
-at_desc="filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base"
-$at_quiet $as_echo_n "220: $at_desc"
+at_fn_group_banner 220 'DMRTest.at:548' \
+ "filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "220. DMRTest.at:548: testing ..."
+ $as_echo "220. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27154,111 +20281,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s|s~=\".*2\""
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs7.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:548: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:548 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:548"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:548: mv stdout \$baseline.tmp"
-echo DMRTest.at:548 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:548"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:548: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:548 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:548"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:548: diff -b -B \$baseline stdout"
-echo DMRTest.at:548 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:548"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_220
#AT_START_221
-# 221. DMRTest.at:552: filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base
-at_setup_line='DMRTest.at:552'
-at_desc="filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base"
-$at_quiet $as_echo_n "221: $at_desc"
+at_fn_group_banner 221 'DMRTest.at:552' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "221. DMRTest.at:552: testing ..."
+ $as_echo "221. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27267,111 +20362,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s{i1}|i1<32768"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:552 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:552: mv stdout \$baseline.tmp"
-echo DMRTest.at:552 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:552"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:552 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:552: diff -b -B \$baseline stdout"
-echo DMRTest.at:552 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_221
#AT_START_222
-# 222. DMRTest.at:553: filter test_simple_7.xml s{i1}|s<=\"Silly test string: 2\" test_simple_7.xml.g1.trans_base
-at_setup_line='DMRTest.at:553'
-at_desc="filter test_simple_7.xml s{i1}|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.g1.trans_base"
-$at_quiet $as_echo_n "222: $at_desc"
+at_fn_group_banner 222 'DMRTest.at:553' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "222. DMRTest.at:553: testing ..."
+ $as_echo "222. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27380,111 +20443,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="s{i1}|s<=\"Silly test string: 2\""
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:553 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:553: mv stdout \$baseline.tmp"
-echo DMRTest.at:553 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:553"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:553 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:553: diff -b -B \$baseline stdout"
-echo DMRTest.at:553 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_222
#AT_START_223
-# 223. DMRTest.at:556: filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base
-at_setup_line='DMRTest.at:556'
-at_desc="filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base"
-$at_quiet $as_echo_n "223: $at_desc"
+at_fn_group_banner 223 'DMRTest.at:556' \
+ "filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "223. DMRTest.at:556: testing ..."
+ $as_echo "223. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27493,111 +20524,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="outer"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:556: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:556 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:556"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:556: mv stdout \$baseline.tmp"
-echo DMRTest.at:556 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:556"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:556: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:556 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:556"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:556: diff -b -B \$baseline stdout"
-echo DMRTest.at:556 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:556"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_223
#AT_START_224
-# 224. DMRTest.at:557: filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base
-at_setup_line='DMRTest.at:557'
-at_desc="filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base"
-$at_quiet $as_echo_n "224: $at_desc"
+at_fn_group_banner 224 'DMRTest.at:557' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "224. DMRTest.at:557: testing ..."
+ $as_echo "224. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27606,111 +20605,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="outer{x;y}"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:557: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:557 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:557: mv stdout \$baseline.tmp"
-echo DMRTest.at:557 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:557"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:557: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:557 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:557: diff -b -B \$baseline stdout"
-echo DMRTest.at:557 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:557"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_224
#AT_START_225
-# 225. DMRTest.at:558: filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base
-at_setup_line='DMRTest.at:558'
-at_desc="filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base"
-$at_quiet $as_echo_n "225: $at_desc"
+at_fn_group_banner 225 'DMRTest.at:558' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "225. DMRTest.at:558: testing ..."
+ $as_echo "225. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27719,111 +20686,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="outer{x;y;inner}"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:558: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:558 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:558: mv stdout \$baseline.tmp"
-echo DMRTest.at:558 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:558"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:558: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:558 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:558: diff -b -B \$baseline stdout"
-echo DMRTest.at:558 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:558"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_225
#AT_START_226
-# 226. DMRTest.at:559: filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base
-at_setup_line='DMRTest.at:559'
-at_desc="filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base"
-$at_quiet $as_echo_n "226: $at_desc"
+at_fn_group_banner 226 'DMRTest.at:559' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "226. DMRTest.at:559: testing ..."
+ $as_echo "226. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27832,111 +20767,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="outer{x;y;inner|i1<1000}"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f4.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:559: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:559 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:559: mv stdout \$baseline.tmp"
-echo DMRTest.at:559 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:559"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:559: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:559 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:559: diff -b -B \$baseline stdout"
-echo DMRTest.at:559 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:559"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_226
#AT_START_227
-# 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
-at_setup_line='DMRTest.at:560'
-at_desc="filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base"
-$at_quiet $as_echo_n "227: $at_desc"
+at_fn_group_banner 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" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "227. DMRTest.at:560: testing ..."
+ $as_echo "227. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27945,111 +20848,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="outer{x;y;inner|i1<1000}|x<0.0"
baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f5.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:560: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:560 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:560"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:560: mv stdout \$baseline.tmp"
-echo DMRTest.at:560 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:560"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:560: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:560 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:560"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:560: diff -b -B \$baseline stdout"
-echo DMRTest.at:560 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:560"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:560"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_227
#AT_START_228
-# 228. DMRTest.at:567: filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base
-at_setup_line='DMRTest.at:567'
-at_desc="filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base"
-$at_quiet $as_echo_n "228: $at_desc"
+at_fn_group_banner 228 'DMRTest.at:567' \
+ "filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base" ""
at_xfail=no
test "Xpass" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "228. DMRTest.at:567: testing ..."
+ $as_echo "228. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28058,111 +20929,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="/u"
baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces.dmr.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:567: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:567 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:567: mv stdout \$baseline.tmp"
-echo DMRTest.at:567 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:567"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:567: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:567 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:567: diff -b -B \$baseline stdout"
-echo DMRTest.at:567 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_228
#AT_START_229
-# 229. DMRTest.at:568: filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base
-at_setup_line='DMRTest.at:568'
-at_desc="filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base"
-$at_quiet $as_echo_n "229: $at_desc"
+at_fn_group_banner 229 'DMRTest.at:568' \
+ "filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base" ""
at_xfail=no
test "Xxfail" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "229. DMRTest.at:568: testing ..."
+ $as_echo "229. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28171,111 +21010,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="/inst2/u"
baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces.dmr.2.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:568: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:568 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:568"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:568: mv stdout \$baseline.tmp"
-echo DMRTest.at:568 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:568"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:568: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:568 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:568"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:568: diff -b -B \$baseline stdout"
-echo DMRTest.at:568 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:568"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_229
#AT_START_230
-# 230. DMRTest.at:569: filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base
-at_setup_line='DMRTest.at:569'
-at_desc="filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base"
-$at_quiet $as_echo_n "230: $at_desc"
+at_fn_group_banner 230 'DMRTest.at:569' \
+ "filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base" ""
at_xfail=no
test "Xxfail" = "Xxfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "230. DMRTest.at:569: testing ..."
+ $as_echo "230. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28284,111 +21091,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="/inst2/Point.x"
baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces.dmr.3.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:569: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:569 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:569"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:569: mv stdout \$baseline.tmp"
-echo DMRTest.at:569 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:569"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:569: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:569 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:569"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:569: diff -b -B \$baseline stdout"
-echo DMRTest.at:569 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:569"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_230
#AT_START_231
-# 231. DMRTest.at:571: filter names_with_spaces2.dmr /inst2/\"Point Break\".x names_with_spaces2.dmr.1.trans_base
-at_setup_line='DMRTest.at:571'
-at_desc="filter names_with_spaces2.dmr /inst2/\\\"Point Break\\\".x names_with_spaces2.dmr.1.trans_base"
-$at_quiet $as_echo_n "231: $at_desc"
+at_fn_group_banner 231 'DMRTest.at:571' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "231. DMRTest.at:571: testing ..."
+ $as_echo "231. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28397,111 +21172,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="/inst2/\"Point Break\".x"
baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces2.dmr.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:571: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:571 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:571: mv stdout \$baseline.tmp"
-echo DMRTest.at:571 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:571"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:571: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:571 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:571: diff -b -B \$baseline stdout"
-echo DMRTest.at:571 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_231
#AT_START_232
-# 232. DMRTest.at:572: filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base
-at_setup_line='DMRTest.at:572'
-at_desc="filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base"
-$at_quiet $as_echo_n "232: $at_desc"
+at_fn_group_banner 232 'DMRTest.at:572' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "232. DMRTest.at:572: testing ..."
+ $as_echo "232. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28510,111 +21253,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="/inst2/Point%20Break.x"
baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces2.dmr.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:572: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:572 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:572: mv stdout \$baseline.tmp"
-echo DMRTest.at:572 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:572"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:572: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:572 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:572: diff -b -B \$baseline stdout"
-echo DMRTest.at:572 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_232
#AT_START_233
-# 233. DMRTest.at:573: filter names_with_spaces2.dmr /inst2/\"Point%20Break\".x names_with_spaces2.dmr.1.trans_base
-at_setup_line='DMRTest.at:573'
-at_desc="filter names_with_spaces2.dmr /inst2/\\\"Point%20Break\\\".x names_with_spaces2.dmr.1.trans_base"
-$at_quiet $as_echo_n "233: $at_desc"
+at_fn_group_banner 233 'DMRTest.at:573' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "233. DMRTest.at:573: testing ..."
+ $as_echo "233. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28623,111 +21334,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="/inst2/\"Point%20Break\".x"
baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces2.dmr.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:573: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:573 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:573"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:573: mv stdout \$baseline.tmp"
-echo DMRTest.at:573 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:573"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:573: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:573 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:573"
+( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:573: diff -b -B \$baseline stdout"
-echo DMRTest.at:573 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:573"
+( $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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:573"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_233
#AT_START_234
-# 234. DMRTest.at:575: filter names_with_spaces3.dmr /inst2/\"New Group\"/x names_with_spaces3.dmr.1.trans_base
-at_setup_line='DMRTest.at:575'
-at_desc="filter names_with_spaces3.dmr /inst2/\\\"New Group\\\"/x names_with_spaces3.dmr.1.trans_base"
-$at_quiet $as_echo_n "234: $at_desc"
+at_fn_group_banner 234 'DMRTest.at:575' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "234. DMRTest.at:575: testing ..."
+ $as_echo "234. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28736,111 +21415,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="/inst2/\"New Group\"/x"
baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces3.dmr.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:575: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:575 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:575: mv stdout \$baseline.tmp"
-echo DMRTest.at:575 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:575"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:575: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:575 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:575: diff -b -B \$baseline stdout"
-echo DMRTest.at:575 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:575"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_234
#AT_START_235
-# 235. DMRTest.at:576: filter names_with_spaces3.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base
-at_setup_line='DMRTest.at:576'
-at_desc="filter names_with_spaces3.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base"
-$at_quiet $as_echo_n "235: $at_desc"
+at_fn_group_banner 235 'DMRTest.at:576' \
+ "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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "235. DMRTest.at:576: testing ..."
+ $as_echo "235. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28849,98 +21496,69 @@ echo "# -*- compilation -*-" >> "$at_group_log"
ce="/inst2/New%20Group/x"
baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces3.dmr.1.trans_base
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:576: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:576 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:576: mv stdout \$baseline.tmp"
-echo DMRTest.at:576 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $baseline.tmp"; then
- ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:576"
+( $at_check_trace; mv stdout $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_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:576: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-echo DMRTest.at:576 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
- ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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@<Value>[0-9a-f][0-9a-f]*</Value>@@'
+) >>"$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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/DMRTest.at:576: diff -b -B \$baseline stdout"
-echo DMRTest.at:576 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $baseline stdout"; then
- ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+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_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:576"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_235
diff --git a/tests/EXPRTest b/tests/EXPRTest
index 640b000..1a6c17e 100755
--- a/tests/EXPRTest
+++ b/tests/EXPRTest
@@ -1,17 +1,17 @@
#! /bin/sh
-# Generated from EXPRTest.at by GNU Autoconf 2.63.
+# Generated from EXPRTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
# This test suite is free software; the Free Software Foundation gives
# unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,23 +19,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -43,7 +35,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -54,7 +52,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -77,13 +75,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -93,15 +84,16 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -113,12 +105,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -130,330 +126,319 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # 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
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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 ;;
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
fi
-
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
- done
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-fi
-fi
+} # as_fn_mkdir_p
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
+ as_expr=false
fi
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_basename=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf at gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
-
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -470,10 +455,12 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -482,29 +469,18 @@ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell"
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -519,49 +495,29 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -591,6 +547,11 @@ at_errexit_p=false
# Shall we be verbose? ':' means no, empty means yes.
at_verbose=:
at_quiet=
+# Running several jobs in parallel, 0 means as many as test groups.
+at_jobs=1
+at_traceon=:
+at_trace_echo=:
+at_check_filter_trace=:
# Shall we keep the debug scripts? Must be `:' when the suite is
# run by a debug script, so that the script doesn't remove itself.
@@ -605,6 +566,8 @@ at_list_p=false
at_clean=false
# Test groups to run
at_groups=
+# Whether to rerun failed tests.
+at_recheck=
# Whether a write failure occurred
at_write_fail=0
@@ -618,10 +581,10 @@ esac
# Whether -C is in effect.
at_change_dir=false
+# Whether to enable colored test results.
+at_color=no
# List of the tested programs.
at_tested=''
-# List of the all the test groups.
-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130'
# As many question marks as there are digits in the last test group number.
# Used to normalize the test group numbers so that `ls' lists them in
# numerical order.
@@ -653,8 +616,8 @@ at_help_all="1;EXPRTest.at:57;expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k
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;
@@ -758,12 +721,14 @@ at_help_all="1;EXPRTest.at:57;expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k
129;EXPRTest.at:154;expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass);expr;
130;EXPRTest.at:154;expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass);expr;
"
+# List of the all the test groups.
+at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
-# at_func_validate_ranges [NAME...]
-# ---------------------------------
-# Validate and normalize the test group number contained in each
-# variable NAME. Leading zeroes are treated as decimal.
-at_func_validate_ranges ()
+# at_fn_validate_ranges NAME...
+# -----------------------------
+# Validate and normalize the test group number contained in each variable
+# NAME. Leading zeroes are treated as decimal.
+at_fn_validate_ranges ()
{
for at_grp
do
@@ -774,7 +739,7 @@ at_func_validate_ranges ()
fi
case $at_value in
0*) # We want to treat leading 0 as decimal, like expr and test, but
- # at_func_arith treats it as octal if it uses $(( )).
+ # AS_VAR_ARITH treats it as octal if it uses $(( )).
# With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
# expr fork, but it is not worth the effort to determine if the
# shell supports XSI when the user can just avoid leading 0.
@@ -800,8 +765,8 @@ do
fi
case $at_option in
- *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
- *) at_optarg= ;;
+ *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+ *) at_optarg= ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -823,6 +788,19 @@ do
at_clean=:
;;
+ --color )
+ at_color=always
+ ;;
+ --color=* )
+ case $at_optarg in
+ no | never | none) at_color=never ;;
+ auto | tty | if-tty) at_color=auto ;;
+ always | yes | force) at_color=always ;;
+ *) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
+ as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
+ esac
+ ;;
+
--debug | -d )
at_debug_p=:
;;
@@ -837,29 +815,31 @@ do
;;
--trace | -x )
- at_traceon='set -x'; at_traceoff='set +x'
+ at_traceon='set -x'
+ at_trace_echo=echo
+ at_check_filter_trace=at_fn_filter_trace
;;
[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
- at_func_validate_ranges at_option
- at_groups="$at_groups$at_option "
+ at_fn_validate_ranges at_option
+ as_fn_append at_groups "$at_option$as_nl"
;;
# Ranges
[0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
at_range_start=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_start
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.* \('$at_range_start' \)/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,$p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
-[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
at_range_end=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '1,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
[0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -875,11 +855,10 @@ do
at_range_end=$at_range_start
at_range_start=$at_tmp
fi
- at_func_validate_ranges at_range_start at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.*\( '$at_range_start' \)/\1/' \
- -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
# Directory selection.
@@ -889,6 +868,25 @@ do
--directory=* )
at_change_dir=:
at_dir=$at_optarg
+ if test x- = "x$at_dir" ; then
+ at_dir=./-
+ fi
+ ;;
+
+ # Parallel execution.
+ --jobs | -j )
+ at_jobs=0
+ ;;
+ --jobs=* | -j[0-9]* )
+ if test -n "$at_optarg"; then
+ at_jobs=$at_optarg
+ else
+ at_jobs=`expr X$at_option : 'X-j\(.*\)'`
+ fi
+ case $at_jobs in *[!0-9]*)
+ at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
+ as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
+ esac
;;
# Keywords.
@@ -915,11 +913,12 @@ do
at_groups_selected=`$as_echo "$at_groups_selected" |
grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
done
- # Smash the newlines.
- at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
- tr "$as_nl" ' '
- `
- at_groups="$at_groups$at_groups_selected "
+ # Smash the keywords.
+ at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
+ as_fn_append at_groups "$at_groups_selected$as_nl"
+ ;;
+ --recheck)
+ at_recheck=:
;;
--baselines )
at_prev=--baselines
@@ -937,14 +936,12 @@ do
# Reject names that are not valid shell variable names.
case $at_envvar in
'' | [0-9]* | *[!_$as_cr_alnum]* )
- { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
-$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
esac
at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
# Export now, but save eval for later and for debug scripts.
export $at_envvar
- at_debug_args="$at_debug_args $at_envvar='$at_value'"
+ as_fn_append at_debug_args " $at_envvar='$at_value'"
;;
*) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -955,32 +952,54 @@ $as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
done
# Verify our last option didn't require an argument
-if test -n "$at_prev"; then
- { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
-$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
- { (exit 1); exit 1; }; }
+if test -n "$at_prev"; then :
+ as_fn_error $? "\`$at_prev' requires an argument"
fi
+# The file containing the suite.
+at_suite_log=$at_dir/$as_me.log
# Selected test groups.
-if test -z "$at_groups"; then
+if test -z "$at_groups$at_recheck"; then
at_groups=$at_groups_all
else
+ if test -n "$at_recheck" && test -r "$at_suite_log"; then
+ at_oldfails=`sed -n '
+ /^Failed tests:$/,/^Skipped tests:$/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^Unexpected passes:$/,/^## Detailed failed tests/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^## Detailed failed tests/q
+ ' "$at_suite_log"`
+ as_fn_append at_groups "$at_oldfails$as_nl"
+ fi
# Sort the tests, removing duplicates.
- at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
+ at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
+fi
+
+if test x"$at_color" = xalways \
+ || { test x"$at_color" = xauto && test -t 1; }; then
+ at_red=`printf '\033[0;31m'`
+ at_grn=`printf '\033[0;32m'`
+ at_lgn=`printf '\033[1;32m'`
+ at_blu=`printf '\033[1;34m'`
+ at_std=`printf '\033[m'`
+else
+ at_red= at_grn= at_lgn= at_blu= at_std=
fi
##
## Process package specific options when _not_ supplied.
##
-if $at_arg_given_baselines; then
- :
+if $at_arg_given_baselines; then :
+
else
baselines=
fi
-
# Help message.
if $at_help_p; then
cat <<_ATEOF || at_write_fail=1
@@ -989,16 +1008,17 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
Run all the tests, or the selected TESTS, given by numeric ranges, and
save a detailed log file. Upon failure, create debugging scripts.
-You should not change environment variables unless explicitly passed
-as command line arguments. Set \`AUTOTEST_PATH' to select the executables
+Do not change environment variables directly. Instead, set them via
+command line arguments. Set \`AUTOTEST_PATH' to select the executables
to exercise. Each relative directory is expanded as build and source
-directories relatively to the top level of this distribution. E.g.,
+directories relative to the top level of this distribution.
+E.g., from within the build directory /tmp/foo-1.0, invoking this:
$ $0 AUTOTEST_PATH=bin
-possibly amounts into
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
- PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
+ PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
_ATEOF
cat <<_ATEOF || at_write_fail=1
@@ -1013,9 +1033,14 @@ cat <<_ATEOF || at_write_fail=1
Execution tuning:
-C, --directory=DIR
change to directory DIR before starting
+ --color[=never|auto|always]
+ enable colored test results on terminal, or always
+ -j, --jobs[=N]
+ Allow N jobs at once; infinite jobs with no arg (default 1)
-k, --keywords=KEYWORDS
select the tests matching all the comma-separated KEYWORDS
multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
+ --recheck select all tests that failed or passed unexpectedly last time
-e, --errexit abort as soon as a test fails; implies --debug
-v, --verbose force more detailed output
default for debugging scripts
@@ -1041,64 +1066,69 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-libdap 3.18.3 test suite: expr-test test groups:
+libdap 3.19.0 test suite: expr-test test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
_ATEOF
- # Passing at_groups is tricky. We cannot use it to form a literal string
- # or regexp because of the limitation of AIX awk. And Solaris' awk
- # doesn't grok more than 99 fields in a record, so we have to use `split'.
- # at_groups needs to be space-separated for this script to work.
- case $at_groups in
- *"$as_nl"* )
- at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
- esac
- $as_echo "$at_groups$as_nl$at_help_all" |
- awk 'BEGIN { FS = ";" }
- NR == 1 {
- for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
+ # Pass an empty line as separator between selected groups and help.
+ $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
+ awk 'NF == 1 && FS != ";" {
+ selected[$ 1] = 1
next
}
- {
+ /^$/ { FS = ";" }
+ NF > 0 {
if (selected[$ 1]) {
printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
- if ($ 4) printf " %s\n", $ 4
+ if ($ 4) {
+ lmax = 79
+ indent = " "
+ line = indent
+ len = length (line)
+ n = split ($ 4, a, " ")
+ for (i = 1; i <= n; i++) {
+ l = length (a[i]) + 1
+ if (i > 1 && len + l > lmax) {
+ print line
+ line = indent " " a[i]
+ len = length (line)
+ } else {
+ line = line " " a[i]
+ len += l
+ }
+ }
+ if (n)
+ print line
+ }
}
}' || at_write_fail=1
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (libdap 3.18.3)" &&
- cat <<\_ACEOF || at_write_fail=1
+ $as_echo "$as_me (libdap 3.19.0)" &&
+ cat <<\_ATEOF || at_write_fail=1
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This test suite is free software; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
-_ACEOF
+_ATEOF
exit $at_write_fail
fi
-# Should we print banners? at_groups is space-separated for entire test,
-# newline-separated if only a subset of the testsuite is run.
-case $at_groups in
- *' '*' '* | *"$as_nl"*"$as_nl"* )
- at_print_banners=: ;;
+# Should we print banners? Yes if more than one test is run.
+case $at_groups in #(
+ *$as_nl* )
+ at_print_banners=: ;; #(
* ) at_print_banners=false ;;
esac
-# Text for banner N, set to empty once printed.
+# Text for banner N, set to a single space once printed.
# Take any -C into account.
if $at_change_dir ; then
- if test x- = "x$at_dir" ; then
- at_dir=./-
- fi
test x != "x$at_dir" && cd "$at_dir" \
- || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
-$as_echo "$as_me: error: unable to change directory" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error $? "unable to change directory"
at_dir=`pwd`
fi
@@ -1106,13 +1136,11 @@ fi
for at_file in atconfig atlocal
do
test -r $at_file || continue
- . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
-$as_echo "$as_me: error: invalid content: $at_file" >&2;}
- { (exit 1); exit 1; }; }
+ . ./$at_file || as_fn_error $? "invalid content: $at_file"
done
# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: ${at_top_build_prefix=$at_top_builddir}
+: "${at_top_build_prefix=$at_top_builddir}"
# Perform any assignments requested during argument parsing.
eval "$at_debug_args"
@@ -1123,8 +1151,7 @@ if test -n "$at_top_srcdir"; then
builddir=../..
for at_dir_var in srcdir top_srcdir top_build_prefix
do
- at_val=`eval 'as_val=${'at_$at_dir_var'}
- $as_echo "$as_val"'`
+ eval at_val=\$at_$at_dir_var
case $at_val in
[\\/$]* | ?:[\\/]* ) at_prefix= ;;
*) at_prefix=../../ ;;
@@ -1133,9 +1160,9 @@ if test -n "$at_top_srcdir"; then
done
fi
-## ------------------- ##
-## Directory structure ##
-## ------------------- ##
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
# This is the set of directories and files used by this script
# (non-literals are capitalized):
@@ -1166,12 +1193,14 @@ fi
# The directory the whole suite works in.
# Should be absolute to let the user `cd' at will.
at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite.
+# The file containing the suite ($at_dir might have changed since earlier).
at_suite_log=$at_dir/$as_me.log
# The directory containing helper files per test group.
at_helper_dir=$at_suite_dir/at-groups
# Stop file: if it exists, do not start new jobs.
at_stop_file=$at_suite_dir/at-stop
+# The fifo used for the job dispatcher.
+at_job_fifo=$at_suite_dir/at-job-fifo
if $at_clean; then
test -d "$at_suite_dir" &&
@@ -1195,23 +1224,23 @@ for as_dir in $AUTOTEST_PATH $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
+ test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
case $as_dir in
[\\/]* | ?:[\\/]* )
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
;;
* )
if test -z "$at_top_build_prefix"; then
# Stand-alone test suite.
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
else
# Embedded test suite.
- at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
- at_path=$at_path$at_top_srcdir/$as_dir
+ as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
+ as_fn_append at_path "$at_top_srcdir/$as_dir"
fi
;;
esac
-done
+ done
IFS=$as_save_IFS
@@ -1225,7 +1254,7 @@ for as_dir in $at_path
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -d "$as_dir" || continue
+ test -d "$as_dir" || continue
case $as_dir in
[\\/]* | ?:[\\/]* ) ;;
* ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1233,15 +1262,18 @@ esac
case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
*$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
$PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
- *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
+ *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
esac
-done
+ done
IFS=$as_save_IFS
PATH=$at_new_path
export PATH
# Setting up the FDs.
+
+
+
# 5 is the log file. Not to be overwritten if `-d'.
if $at_debug_p; then
at_suite_log=/dev/null
@@ -1251,43 +1283,28 @@ fi
exec 5>>"$at_suite_log"
# Banners and logs.
-cat <<\_ASBOX
-## ------------------------------------ ##
-## libdap 3.18.3 test suite: expr-test. ##
-## ------------------------------------ ##
-_ASBOX
+$as_echo "## ------------------------------------ ##
+## libdap 3.19.0 test suite: expr-test. ##
+## ------------------------------------ ##"
{
- cat <<\_ASBOX
-## ------------------------------------ ##
-## libdap 3.18.3 test suite: expr-test. ##
-## ------------------------------------ ##
-_ASBOX
+ $as_echo "## ------------------------------------ ##
+## libdap 3.19.0 test suite: expr-test. ##
+## ------------------------------------ ##"
echo
$as_echo "$as_me: command line was:"
$as_echo " \$ $0 $at_cli_args"
echo
- # Try to find a few ChangeLogs in case it might help determining the
- # exact version. Use the relative dir: if the top dir is a symlink,
- # find will not follow it (and options to follow the links are not
- # portable), which would result in no output here. Prune directories
- # matching the package tarname, since they tend to be leftovers from
- # `make dist' or `make distcheck' and contain redundant or stale logs.
- if test -n "$at_top_srcdir"; then
- cat <<\_ASBOX
-## ----------- ##
-## ChangeLogs. ##
-## ----------- ##
-_ASBOX
+ # If ChangeLog exists, list a few lines in case it might help determining
+ # the exact version.
+ if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
+ $as_echo "## ---------- ##
+## ChangeLog. ##
+## ---------- ##"
+ echo
+ sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
echo
- for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
- do
- $as_echo "$as_me: $at_file:"
- sed 's/^/| /;10q' $at_file
- echo
- done
-
fi
{
@@ -1320,8 +1337,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
}
@@ -1338,53 +1355,80 @@ IFS=$as_save_IFS
} >&5
-## --------------- ##
-## Shell functions ##
-## --------------- ##
+## ------------------------- ##
+## Autotest shell functions. ##
+## ------------------------- ##
-# at_func_banner NUMBER
-# ---------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups
-# and this particular banner has not yet been printed.
-at_func_banner ()
+# at_fn_banner NUMBER
+# -------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups and
+# this particular banner has not yet been printed.
+at_fn_banner ()
{
$at_print_banners || return 0
eval at_banner_text=\$at_banner_text_$1
- test "x$at_banner_text" = x && return 0
- eval at_banner_text_$1=
- $as_echo "$as_nl$at_banner_text$as_nl"
-} # at_func_banner
+ test "x$at_banner_text" = "x " && return 0
+ eval "at_banner_text_$1=\" \""
+ if test -z "$at_banner_text"; then
+ $at_first || echo
+ else
+ $as_echo "$as_nl$at_banner_text$as_nl"
+ fi
+} # at_fn_banner
-# at_func_check_newline COMMAND
-# -----------------------------
-# Test if COMMAND includes a newline and, if so, print a message and return
-# exit code 1
-at_func_check_newline ()
+# at_fn_check_prepare_notrace REASON LINE
+# ---------------------------------------
+# Perform AT_CHECK preparations for the command at LINE for an untraceable
+# command; REASON is the reason for disabling tracing.
+at_fn_check_prepare_notrace ()
{
- case "$1" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
- return 1 ;;
- *) return 0 ;;
- esac
+ $at_trace_echo "Not enabling shell tracing (command contains $1)"
+ $as_echo "$2" >"$at_check_line_file"
+ at_check_trace=: at_check_filter=:
+ : >"$at_stdout"; : >"$at_stderr"
}
-# at_func_filter_trace EXIT-CODE
+# at_fn_check_prepare_trace LINE
# ------------------------------
-# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
-# and the other lines (on file "$at_stderr"). Return the exit code EXIT-CODE.
-at_func_filter_trace ()
+# Perform AT_CHECK preparations for the command at LINE for a traceable
+# command.
+at_fn_check_prepare_trace ()
+{
+ $as_echo "$1" >"$at_check_line_file"
+ at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
+ : >"$at_stdout"; : >"$at_stderr"
+}
+
+# at_fn_check_prepare_dynamic COMMAND LINE
+# ----------------------------------------
+# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
+# preparation function.
+at_fn_check_prepare_dynamic ()
{
+ case $1 in
+ *$as_nl*)
+ at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+ *)
+ at_fn_check_prepare_trace "$2" ;;
+ esac
+}
+
+# at_fn_filter_trace
+# ------------------
+# Remove the lines in the file "$at_stderr" generated by "set -x" and print
+# them to stderr.
+at_fn_filter_trace ()
+{
+ mv "$at_stderr" "$at_stder1"
grep '^ *+' "$at_stder1" >&2
grep -v '^ *+' "$at_stder1" >"$at_stderr"
- return $1
}
-# at_func_log_failure FILE-LIST
-# -----------------------------
+# at_fn_log_failure FILE-LIST
+# ---------------------------
# Copy the files in the list on stdout with a "> " prefix, and exit the shell
# with a failure exit code.
-at_func_log_failure ()
+at_fn_log_failure ()
{
for file
do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1392,56 +1436,62 @@ at_func_log_failure ()
exit 1
}
-# at_func_check_skip EXIT-CODE
-# ----------------------------
-# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
-# with that same exit code.
-at_func_check_skip ()
+# at_fn_check_skip EXIT-CODE LINE
+# -------------------------------
+# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
+# the test group subshell with that same exit code. Use LINE in any report
+# about test failure.
+at_fn_check_skip ()
{
case $1 in
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$2: hard failure"; exit 99;;
77) echo 77 > "$at_status_file"; exit 77;;
esac
}
-# at_func_check_status EXPECTED EXIT-CODE LINE
-# --------------------------------------------
-# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
-# Otherwise, if it is 77 exit the shell with that same exit code; if it is
-# anything else print an error message and fail the test.
-at_func_check_status ()
+# at_fn_check_status EXPECTED EXIT-CODE LINE
+# ------------------------------------------
+# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
+# Otherwise, if it is 77 or 99, exit the test group subshell with that same
+# exit code; if it is anything else print an error message referring to LINE,
+# and fail the test.
+at_fn_check_status ()
{
case $2 in
$1 ) ;;
77) echo 77 > "$at_status_file"; exit 77;;
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$3: hard failure"; exit 99;;
*) $as_echo "$3: exit code was $2, expected $1"
at_failed=:;;
esac
}
-# at_func_diff_devnull FILE
-# -------------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless
-# diff invocations.
-at_func_diff_devnull ()
+# at_fn_diff_devnull FILE
+# -----------------------
+# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
+# invocations.
+at_fn_diff_devnull ()
{
test -s "$1" || return 0
$at_diff "$at_devnull" "$1"
}
-# at_func_test NUMBER
-# -------------------
+# at_fn_test NUMBER
+# -----------------
# Parse out test NUMBER from the tail of this file.
-at_func_test ()
+at_fn_test ()
{
eval at_sed=\$at_sed$1
sed "$at_sed" "$at_myself" > "$at_test_source"
}
-# at_func_create_debugging_script
-# -------------------------------
+# at_fn_create_debugging_script
+# -----------------------------
# Create the debugging script $at_group_dir/run which will reproduce the
# current test group.
-at_func_create_debugging_script ()
+at_fn_create_debugging_script ()
{
{
echo "#! /bin/sh" &&
@@ -1453,34 +1503,13 @@ at_func_create_debugging_script ()
chmod +x "$at_group_dir/run"
}
-# at_func_arith
-# -------------
-# Arithmetic evaluation, avoids expr if the shell is sane. The
-# interpretation of leading zeroes is unspecified.
-#
-# subshell and eval are needed to keep Solaris sh from bailing out:
-if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
- # With "$@", bash does not split positional parameters:
- eval 'at_func_arith ()
- {
- at_func_arith_result=$(( $* ))
- }'
-else
- at_func_arith ()
- {
- at_func_arith_result=`expr "$@"`
- }
-fi
-
-## ---------------------- ##
-## End of shell functions ##
-## ---------------------- ##
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
{
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Tested programs. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
} >&5
@@ -1488,34 +1517,35 @@ _ASBOX
for at_program in : $at_tested
do
test "$at_program" = : && continue
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $at_program in
+ [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
+ * )
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -f "$as_dir/$at_program" && break
-done
+ test -f "$as_dir/$at_program" && break
+ done
IFS=$as_save_IFS
- if test -f "$as_dir/$at_program"; then
+ at_program_=$as_dir/$at_program ;;
+ esac
+ if test -f "$at_program_"; then
{
- $as_echo "$at_srcdir/EXPRTest.at:3: $as_dir/$at_program --version"
- "$as_dir/$at_program" --version </dev/null
+ $as_echo "$at_srcdir/EXPRTest.at:3: $at_program_ --version"
+ "$at_program_" --version </dev/null
echo
} >&5 2>&1
else
- { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
-$as_echo "$as_me: error: cannot find $at_program" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find $at_program" "$LINENO" 5
fi
done
{
- cat <<\_ASBOX
-## ------------------ ##
+ $as_echo "## ------------------ ##
## Running the tests. ##
-## ------------------ ##
-_ASBOX
+## ------------------ ##"
} >&5
at_start_date=`date`
@@ -1523,11 +1553,8 @@ at_start_time=`date +%s 2>/dev/null`
$as_echo "$as_me: starting at: $at_start_date" >&5
# Create the master directory if it doesn't already exist.
-test -d "$at_suite_dir" ||
- mkdir "$at_suite_dir" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
-$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
- { (exit 1); exit 1; }; }
+as_dir="$at_suite_dir"; as_fn_mkdir_p ||
+ as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
# Can we diff with `/dev/null'? DU 5.0 refuses.
if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1561,28 +1588,40 @@ BEGIN { FS="" }
if (test == "'"$at_group"'") exit
}' "$at_myself" > "$at_suite_dir/at-source-lines" &&
. "$at_suite_dir/at-source-lines" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
-$as_echo "$as_me: error: cannot create test line number cache" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot create test line number cache" "$LINENO" 5
rm -f "$at_suite_dir/at-source-lines"
+# Set number of jobs for `-j'; avoid more jobs than test groups.
+set X $at_groups; shift; at_max_jobs=$#
+if test $at_max_jobs -eq 0; then
+ at_jobs=1
+fi
+if test $at_jobs -ne 1 &&
+ { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
+ at_jobs=$at_max_jobs
+fi
+
+# If parallel mode, don't output banners, don't split summary lines.
+if test $at_jobs -ne 1; then
+ at_print_banners=false
+ at_quiet=:
+fi
+
# Set up helper dirs.
rm -rf "$at_helper_dir" &&
mkdir "$at_helper_dir" &&
cd "$at_helper_dir" &&
{ test -z "$at_groups" || mkdir $at_groups; } ||
-{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
-$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
- { (exit 1); exit 1; }; }
+as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
# Functions for running a test group. We leave the actual
# test group execution outside of a shell function in order
# to avoid hitting zsh 4.x exit status bugs.
-# at_func_group_prepare
-# ---------------------
-# Prepare running a test group
-at_func_group_prepare ()
+# at_fn_group_prepare
+# -------------------
+# Prepare for running a test group.
+at_fn_group_prepare ()
{
# The directory for additional per-group helper files.
at_job_dir=$at_helper_dir/$at_group
@@ -1592,80 +1631,44 @@ at_func_group_prepare ()
at_status_file=$at_job_dir/status
# The files containing the output of the tested commands.
at_stdout=$at_job_dir/stdout
- at_stder1=$at_job_dir/stder1
- at_stderr=$at_job_dir/stderr
- # The file containing the code for a test group.
- at_test_source=$at_job_dir/test-source
- # The file containing dates.
- at_times_file=$at_job_dir/times
-
- # Be sure to come back to the top test directory.
- cd "$at_suite_dir"
-
- # Clearly separate the test groups when verbose.
- $at_first || $at_verbose echo
-
- at_group_normalized=$at_group
-
- eval 'while :; do
- case $at_group_normalized in #(
- '"$at_format"'*) break;;
- esac
- at_group_normalized=0$at_group_normalized
- done'
-
-
- # Create a fresh directory for the next test group, and enter.
- at_group_dir=$at_suite_dir/$at_group_normalized
- at_group_log=$at_group_dir/$as_me.log
- if test -d "$at_group_dir"; then
- find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
- rm -fr "$at_group_dir" ||
- { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
- fi
- # Be tolerant if the above `rm' was not able to remove the directory.
- { as_dir="$at_group_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ at_stder1=$at_job_dir/stder1
+ at_stderr=$at_job_dir/stderr
+ # The file containing the code for a test group.
+ at_test_source=$at_job_dir/test-source
+ # The file containing dates.
+ at_times_file=$at_job_dir/times
+
+ # Be sure to come back to the top test directory.
+ cd "$at_suite_dir"
+
+ # Clearly separate the test groups when verbose.
+ $at_first || $at_verbose echo
+
+ at_group_normalized=$at_group
+
+ eval 'while :; do
+ case $at_group_normalized in #(
+ '"$at_format"'*) break;;
+ esac
+ at_group_normalized=0$at_group_normalized
+ done'
+
+
+ # Create a fresh directory for the next test group, and enter.
+ # If one already exists, the user may have invoked ./run from
+ # within that directory; we remove the contents, but not the
+ # directory itself, so that we aren't pulling the rug out from
+ # under the shell's notion of the current directory.
+ at_group_dir=$at_suite_dir/$at_group_normalized
+ at_group_log=$at_group_dir/$as_me.log
+ if test -d "$at_group_dir"; then
+ find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
+ rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
+fi ||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
+ # Be tolerant if the above `rm' was not able to remove the directory.
+ as_dir="$at_group_dir"; as_fn_mkdir_p
echo 0 > "$at_status_file"
@@ -1678,9 +1681,29 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
fi
}
-# at_func_group_postprocess
-# -------------------------
-at_func_group_postprocess ()
+# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
+# -------------------------------------------------
+# Declare the test group ORDINAL, located at LINE with group description DESC,
+# and residing under BANNER. Use PAD to align the status column.
+at_fn_group_banner ()
+{
+ at_setup_line="$2"
+ test -n "$5" && at_fn_banner $5
+ at_desc="$3"
+ case $1 in
+ [0-9]) at_desc_line=" $1: ";;
+ [0-9][0-9]) at_desc_line=" $1: " ;;
+ *) at_desc_line="$1: " ;;
+ esac
+ as_fn_append at_desc_line "$3$4"
+ $at_quiet $as_echo_n "$at_desc_line"
+ echo "# -*- compilation -*-" >> "$at_group_log"
+}
+
+# at_fn_group_postprocess
+# -----------------------
+# Perform cleanup after running a test group.
+at_fn_group_postprocess ()
{
# Be sure to come back to the suite directory, in particular
# since below we might `rm' the group directory we are in currently.
@@ -1693,6 +1716,7 @@ at_func_group_postprocess ()
report this failure to <opendap-tech at opendap.org>.
_ATEOF
$as_echo "$at_setup_line" >"$at_check_line_file"
+ at_status=99
fi
$at_verbose $as_echo_n "$at_group. $at_setup_line: "
$as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1701,31 +1725,41 @@ _ATEOF
at_msg="UNEXPECTED PASS"
at_res=xpass
at_errexit=$at_errexit_p
+ at_color=$at_red
;;
no:0)
at_msg="ok"
at_res=pass
at_errexit=false
+ at_color=$at_grn
;;
*:77)
at_msg='skipped ('`cat "$at_check_line_file"`')'
at_res=skip
at_errexit=false
+ at_color=$at_blu
+ ;;
+ no:* | *:99)
+ at_msg='FAILED ('`cat "$at_check_line_file"`')'
+ at_res=fail
+ at_errexit=$at_errexit_p
+ at_color=$at_red
;;
yes:*)
at_msg='expected failure ('`cat "$at_check_line_file"`')'
at_res=xfail
at_errexit=false
- ;;
- no:*)
- at_msg='FAILED ('`cat "$at_check_line_file"`')'
- at_res=fail
- at_errexit=$at_errexit_p
+ at_color=$at_lgn
;;
esac
echo "$at_res" > "$at_job_dir/$at_res"
- # Make sure there is a separator even with long titles.
- $as_echo " $at_msg"
+ # In parallel mode, output the summary line only afterwards.
+ if test $at_jobs -ne 1 && test -n "$at_verbose"; then
+ $as_echo "$at_desc_line $at_color$at_msg$at_std"
+ else
+ # Make sure there is a separator even with long titles.
+ $as_echo " $at_color$at_msg$at_std"
+ fi
at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
case $at_status in
0|77)
@@ -1740,9 +1774,13 @@ _ATEOF
$as_echo "$at_log_msg" >> "$at_group_log"
$as_echo "$at_log_msg" >&5
- # Cleanup the group directory, unless the user wants the files.
- if $at_debug_p; then
- at_func_create_debugging_script
+ # Cleanup the group directory, unless the user wants the files
+ # or the success was unexpected.
+ if $at_debug_p || test $at_res = xpass; then
+ at_fn_create_debugging_script
+ if test $at_res = xpass && $at_errexit; then
+ echo stop > "$at_stop_file"
+ fi
else
if test -d "$at_group_dir"; then
find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1759,7 +1797,7 @@ _ATEOF
# Upon failure, keep the group directory for autopsy, and create
# the debugging script. With -e, do not start any further tests.
- at_func_create_debugging_script
+ at_fn_create_debugging_script
if $at_errexit; then
echo stop > "$at_stop_file"
fi
@@ -1772,22 +1810,134 @@ _ATEOF
## Driver loop. ##
## ------------ ##
+
+if (set -m && set +m && set +b) >/dev/null 2>&1; then
+ set +b
+ at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
+else
+ at_job_control_on=: at_job_control_off=: at_job_group=
+fi
+
+for at_signal in 1 2 15; do
+ trap 'set +x; set +e
+ $at_job_control_off
+ at_signal='"$at_signal"'
+ echo stop > "$at_stop_file"
+ trap "" $at_signal
+ at_pgids=
+ for at_pgid in `jobs -p 2>/dev/null`; do
+ at_pgids="$at_pgids $at_job_group$at_pgid"
+ done
+ test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
+ wait
+ if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
+ echo >&2
+ fi
+ at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
+ set x $at_signame
+ test 1 -gt 2 && at_signame=$at_signal
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
+$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
+ as_fn_arith 128 + $at_signal && exit_status=$as_val
+ as_fn_exit $exit_status' $at_signal
+done
+
rm -f "$at_stop_file"
at_first=:
-for at_group in $at_groups; do
- at_func_group_prepare
- if cd "$at_group_dir" &&
- at_func_test $at_group &&
- . "$at_test_source"; then :; else
- { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
+if test $at_jobs -ne 1 &&
+ rm -f "$at_job_fifo" &&
+ test -n "$at_job_group" &&
+ ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
+then
+ # FIFO job dispatcher.
+
+ trap 'at_pids=
+ for at_pid in `jobs -p`; do
+ at_pids="$at_pids $at_job_group$at_pid"
+ done
+ if test -n "$at_pids"; then
+ at_sig=TSTP
+ test "${TMOUT+set}" = set && at_sig=STOP
+ kill -$at_sig $at_pids 2>/dev/null
+ fi
+ kill -STOP $$
+ test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
+
+ echo
+ # Turn jobs into a list of numbers, starting from 1.
+ at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
+
+ set X $at_joblist
+ shift
+ for at_group in $at_groups; do
+ $at_job_control_on 2>/dev/null
+ (
+ # Start one test group.
+ $at_job_control_off
+ if $at_first; then
+ exec 7>"$at_job_fifo"
+ else
+ exec 6<&-
+ fi
+ trap 'set +x; set +e
+ trap "" PIPE
+ echo stop > "$at_stop_file"
+ echo >&7
+ as_fn_exit 141' PIPE
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"
+ then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
- at_failed=:
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ echo >&7
+ ) &
+ $at_job_control_off
+ if $at_first; then
+ at_first=false
+ exec 6<"$at_job_fifo" 7>"$at_job_fifo"
+ fi
+ shift # Consume one token.
+ if test $# -gt 0; then :; else
+ read at_token <&6 || break
+ set x $*
+ fi
+ test -f "$at_stop_file" && break
+ done
+ exec 7>&-
+ # Read back the remaining ($at_jobs - 1) tokens.
+ set X $at_joblist
+ shift
+ if test $# -gt 0; then
+ shift
+ for at_job
+ do
+ read at_token
+ done <&6
fi
- at_func_group_postprocess
- test -f "$at_stop_file" && break
- at_first=false
-done
+ exec 6<&-
+ wait
+else
+ # Run serially, avoid forks and other potential surprises.
+ for at_group in $at_groups; do
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"; then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ test -f "$at_stop_file" && break
+ at_first=false
+ done
+fi
# Wrap up the test suite with summary statistics.
cd "$at_helper_dir"
@@ -1808,12 +1958,9 @@ set X $at_xfail_list; shift; at_xfail_count=$#
set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
set X $at_skip_list; shift; at_skip_count=$#
-at_func_arith $at_group_count - $at_skip_count
-at_run_count=$at_func_arith_result
-at_func_arith $at_xpass_count + $at_fail_count
-at_unexpected_count=$at_func_arith_result
-at_func_arith $at_xfail_count + $at_fail_count
-at_total_fail_count=$at_func_arith_result
+as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
+as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
+as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
# Back to the top directory.
cd "$at_dir"
@@ -1825,35 +1972,26 @@ at_stop_time=`date +%s 2>/dev/null`
$as_echo "$as_me: ending at: $at_stop_date" >&5
case $at_start_time,$at_stop_time in
[0-9]*,[0-9]*)
- at_func_arith $at_stop_time - $at_start_time
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_s / 60
- at_duration_m=$at_func_arith_result
- at_func_arith $at_duration_m / 60
- at_duration_h=$at_func_arith_result
- at_func_arith $at_duration_s % 60
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_m % 60
- at_duration_m=$at_func_arith_result
+ as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
+ as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
+ as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
+ as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
+ as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
$as_echo "$as_me: test suite duration: $at_duration" >&5
;;
esac
echo
-cat <<\_ASBOX
-## ------------- ##
+$as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
{
echo
- cat <<\_ASBOX
-## ------------- ##
+ $as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
} >&5
@@ -1871,12 +2009,14 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
at_result="$at_result $at_were run, one failed"
fi
at_result="$at_result unexpectedly and inhibited subsequent tests."
+ at_color=$at_red
else
# Don't you just love exponential explosion of the number of cases?
+ at_color=$at_red
case $at_xpass_count:$at_fail_count:$at_xfail_count in
# So far, so good.
- 0:0:0) at_result="$at_result $at_were successful." ;;
- 0:0:*) at_result="$at_result behaved as expected." ;;
+ 0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
+ 0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
# Some unexpected failures
0:*:0) at_result="$at_result $at_were run,
@@ -1922,18 +2062,16 @@ $at_skip_count tests were skipped." ;;
esac
if test $at_unexpected_count = 0; then
- echo "$at_result"
+ echo "$at_color$at_result$at_std"
echo "$at_result" >&5
else
- echo "ERROR: $at_result" >&2
+ echo "${at_color}ERROR: $at_result$at_std" >&2
echo "ERROR: $at_result" >&5
{
echo
- cat <<\_ASBOX
-## ------------------------ ##
+ $as_echo "## ------------------------ ##
## Summary of the failures. ##
-## ------------------------ ##
-_ASBOX
+## ------------------------ ##"
# Summary of failed and skipped tests.
if test $at_fail_count != 0; then
@@ -1952,11 +2090,9 @@ _ASBOX
echo
fi
if test $at_fail_count != 0; then
- cat <<\_ASBOX
-## ---------------------- ##
+ $as_echo "## ---------------------- ##
## Detailed failed tests. ##
-## ---------------------- ##
-_ASBOX
+## ---------------------- ##"
echo
for at_group in $at_fail_list
do
@@ -1988,19 +2124,21 @@ _ASBOX
_ASBOX
echo
- $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
+ if $at_debug_p; then
+ at_msg='per-test log files'
+ else
+ at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
+ fi
+ $as_echo "Please send $at_msg and all information you think might help:
To: <opendap-tech at opendap.org>
- Subject: [libdap 3.18.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [libdap 3.19.0] $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
+be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
"
- if test $at_debug_p = false; then
- echo
- echo 'You may investigate any problem if you feel able to do so, in which'
- echo 'case the test suite provides a good starting point. Its output may'
- $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
- echo
- fi
- exit 1
+ exit 1
fi
exit 0
@@ -2009,15 +2147,12 @@ exit 0
## Actual tests. ##
## ------------- ##
#AT_START_1
-# 1. EXPRTest.at:57: expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i (pass)
-at_setup_line='EXPRTest.at:57'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i (pass)"
-$at_quiet $as_echo_n " 1: $at_desc"
+at_fn_group_banner 1 'EXPRTest.at:57' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "1. EXPRTest.at:57: testing ..."
+ $as_echo "1. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2029,111 +2164,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:57: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"
-echo EXPRTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true" "EXPRTest.at:57"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:57: mv stdout \$abs_srcdir/expr-testsuite/test.1.base.tmp"
-echo EXPRTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp" "EXPRTest.at:57"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1.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:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:57: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"
-echo EXPRTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true" "EXPRTest.at:57"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:57: diff -b -B \$abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1.base stderr"
-echo EXPRTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr" "EXPRTest.at:57"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_1
#AT_START_2
-# 2. EXPRTest.at:57: expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i (pass)
-at_setup_line='EXPRTest.at:57'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i (pass)"
-$at_quiet $as_echo_n " 2: $at_desc"
+at_fn_group_banner 2 'EXPRTest.at:57' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "2. EXPRTest.at:57: testing ..."
+ $as_echo "2. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2145,111 +2248,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:57: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"
-echo EXPRTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true" "EXPRTest.at:57"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:57: mv stdout \$abs_srcdir/expr-testsuite/test.1.base.tmp"
-echo EXPRTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp" "EXPRTest.at:57"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1.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:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:57: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"
-echo EXPRTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true" "EXPRTest.at:57"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:57: diff -b -B \$abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1.base stderr"
-echo EXPRTest.at:57 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr" "EXPRTest.at:57"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_2
#AT_START_3
-# 3. EXPRTest.at:58: expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j (pass)
-at_setup_line='EXPRTest.at:58'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass)"
-$at_quiet $as_echo_n " 3: $at_desc"
+at_fn_group_banner 3 'EXPRTest.at:58' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "3. EXPRTest.at:58: testing ..."
+ $as_echo "3. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2261,111 +2332,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:58: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"
-echo EXPRTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true" "EXPRTest.at:58"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:58: mv stdout \$abs_srcdir/expr-testsuite/test.1a.base.tmp"
-echo EXPRTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp" "EXPRTest.at:58"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1a.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:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:58: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"
-echo EXPRTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true" "EXPRTest.at:58"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:58: diff -b -B \$abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1a.base stderr"
-echo EXPRTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr" "EXPRTest.at:58"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_3
#AT_START_4
-# 4. EXPRTest.at:58: expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j (pass)
-at_setup_line='EXPRTest.at:58'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass)"
-$at_quiet $as_echo_n " 4: $at_desc"
+at_fn_group_banner 4 'EXPRTest.at:58' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "4. EXPRTest.at:58: testing ..."
+ $as_echo "4. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2377,111 +2416,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:58: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"
-echo EXPRTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true" "EXPRTest.at:58"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:58: mv stdout \$abs_srcdir/expr-testsuite/test.1a.base.tmp"
-echo EXPRTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp" "EXPRTest.at:58"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1a.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:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:58: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"
-echo EXPRTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true" "EXPRTest.at:58"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:58: diff -b -B \$abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1a.base stderr"
-echo EXPRTest.at:58 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr" "EXPRTest.at:58"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_4
#AT_START_5
-# 5. EXPRTest.at:59: expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)
-at_setup_line='EXPRTest.at:59'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)"
-$at_quiet $as_echo_n " 5: $at_desc"
+at_fn_group_banner 5 'EXPRTest.at:59' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "5. EXPRTest.at:59: testing ..."
+ $as_echo "5. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2493,111 +2500,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:59: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"
-echo EXPRTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true" "EXPRTest.at:59"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:59: mv stdout \$abs_srcdir/expr-testsuite/test.1b.base.tmp"
-echo EXPRTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp" "EXPRTest.at:59"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1b.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:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:59: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"
-echo EXPRTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true" "EXPRTest.at:59"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:59: diff -b -B \$abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1b.base stderr"
-echo EXPRTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr" "EXPRTest.at:59"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_5
#AT_START_6
-# 6. EXPRTest.at:59: expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)
-at_setup_line='EXPRTest.at:59'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)"
-$at_quiet $as_echo_n " 6: $at_desc"
+at_fn_group_banner 6 'EXPRTest.at:59' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "6. EXPRTest.at:59: testing ..."
+ $as_echo "6. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2609,111 +2584,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:59: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"
-echo EXPRTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true" "EXPRTest.at:59"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:59: mv stdout \$abs_srcdir/expr-testsuite/test.1b.base.tmp"
-echo EXPRTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp" "EXPRTest.at:59"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1b.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:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:59: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"
-echo EXPRTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true" "EXPRTest.at:59"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:59: diff -b -B \$abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1b.base stderr"
-echo EXPRTest.at:59 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr" "EXPRTest.at:59"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_6
#AT_START_7
-# 7. EXPRTest.at:60: expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)
-at_setup_line='EXPRTest.at:60'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)"
-$at_quiet $as_echo_n " 7: $at_desc"
+at_fn_group_banner 7 'EXPRTest.at:60' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "7. EXPRTest.at:60: testing ..."
+ $as_echo "7. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2725,111 +2668,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:60: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"
-echo EXPRTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true" "EXPRTest.at:60"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:60: mv stdout \$abs_srcdir/expr-testsuite/test.1d.base.tmp"
-echo EXPRTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp" "EXPRTest.at:60"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1d.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:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:60: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"
-echo EXPRTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true" "EXPRTest.at:60"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:60: diff -b -B \$abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1d.base stderr"
-echo EXPRTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr" "EXPRTest.at:60"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_7
#AT_START_8
-# 8. EXPRTest.at:60: expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)
-at_setup_line='EXPRTest.at:60'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)"
-$at_quiet $as_echo_n " 8: $at_desc"
+at_fn_group_banner 8 'EXPRTest.at:60' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "8. EXPRTest.at:60: testing ..."
+ $as_echo "8. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2841,111 +2752,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:60: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"
-echo EXPRTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true" "EXPRTest.at:60"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:60: mv stdout \$abs_srcdir/expr-testsuite/test.1d.base.tmp"
-echo EXPRTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp" "EXPRTest.at:60"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1d.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:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:60: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"
-echo EXPRTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true" "EXPRTest.at:60"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:60: diff -b -B \$abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1d.base stderr"
-echo EXPRTest.at:60 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr" "EXPRTest.at:60"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_8
#AT_START_9
-# 9. EXPRTest.at:61: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 (pass)
-at_setup_line='EXPRTest.at:61'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)"
-$at_quiet $as_echo_n " 9: $at_desc"
+at_fn_group_banner 9 'EXPRTest.at:61' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "9. EXPRTest.at:61: testing ..."
+ $as_echo "9. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2957,111 +2836,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:61: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"
-echo EXPRTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true" "EXPRTest.at:61"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:61: mv stdout \$abs_srcdir/expr-testsuite/test.2.base.tmp"
-echo EXPRTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp" "EXPRTest.at:61"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2.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:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:61: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"
-echo EXPRTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true" "EXPRTest.at:61"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:61: diff -b -B \$abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2.base stderr"
-echo EXPRTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr" "EXPRTest.at:61"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_9
#AT_START_10
-# 10. EXPRTest.at:61: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 (pass)
-at_setup_line='EXPRTest.at:61'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)"
-$at_quiet $as_echo_n " 10: $at_desc"
+at_fn_group_banner 10 'EXPRTest.at:61' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "10. EXPRTest.at:61: testing ..."
+ $as_echo "10. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3073,111 +2920,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:61: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"
-echo EXPRTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true" "EXPRTest.at:61"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:61: mv stdout \$abs_srcdir/expr-testsuite/test.2.base.tmp"
-echo EXPRTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp" "EXPRTest.at:61"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2.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:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:61: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"
-echo EXPRTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true" "EXPRTest.at:61"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:61: diff -b -B \$abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2.base stderr"
-echo EXPRTest.at:61 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr" "EXPRTest.at:61"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_10
#AT_START_11
-# 11. EXPRTest.at:62: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 (pass)
-at_setup_line='EXPRTest.at:62'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)"
-$at_quiet $as_echo_n " 11: $at_desc"
+at_fn_group_banner 11 'EXPRTest.at:62' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "11. EXPRTest.at:62: testing ..."
+ $as_echo "11. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3189,111 +3004,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:62: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"
-echo EXPRTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true" "EXPRTest.at:62"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:62: mv stdout \$abs_srcdir/expr-testsuite/test.2a.base.tmp"
-echo EXPRTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp" "EXPRTest.at:62"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2a.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:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:62: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"
-echo EXPRTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true" "EXPRTest.at:62"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:62: diff -b -B \$abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2a.base stderr"
-echo EXPRTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr" "EXPRTest.at:62"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_11
#AT_START_12
-# 12. EXPRTest.at:62: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 (pass)
-at_setup_line='EXPRTest.at:62'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)"
-$at_quiet $as_echo_n " 12: $at_desc"
+at_fn_group_banner 12 'EXPRTest.at:62' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "12. EXPRTest.at:62: testing ..."
+ $as_echo "12. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3305,111 +3088,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:62: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"
-echo EXPRTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true" "EXPRTest.at:62"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:62: mv stdout \$abs_srcdir/expr-testsuite/test.2a.base.tmp"
-echo EXPRTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp" "EXPRTest.at:62"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2a.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:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:62: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"
-echo EXPRTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true" "EXPRTest.at:62"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:62: diff -b -B \$abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2a.base stderr"
-echo EXPRTest.at:62 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr" "EXPRTest.at:62"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_12
#AT_START_13
-# 13. EXPRTest.at:63: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)
-at_setup_line='EXPRTest.at:63'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)"
-$at_quiet $as_echo_n " 13: $at_desc"
+at_fn_group_banner 13 'EXPRTest.at:63' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "13. EXPRTest.at:63: testing ..."
+ $as_echo "13. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3421,111 +3172,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:63: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"
-echo EXPRTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true" "EXPRTest.at:63"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:63: mv stdout \$abs_srcdir/expr-testsuite/test.2b.base.tmp"
-echo EXPRTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp" "EXPRTest.at:63"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2b.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:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:63: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"
-echo EXPRTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true" "EXPRTest.at:63"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:63: diff -b -B \$abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2b.base stderr"
-echo EXPRTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr" "EXPRTest.at:63"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_13
#AT_START_14
-# 14. EXPRTest.at:63: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)
-at_setup_line='EXPRTest.at:63'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)"
-$at_quiet $as_echo_n " 14: $at_desc"
+at_fn_group_banner 14 'EXPRTest.at:63' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "14. EXPRTest.at:63: testing ..."
+ $as_echo "14. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3537,111 +3256,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:63: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"
-echo EXPRTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true" "EXPRTest.at:63"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:63: mv stdout \$abs_srcdir/expr-testsuite/test.2b.base.tmp"
-echo EXPRTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp" "EXPRTest.at:63"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2b.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:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:63: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"
-echo EXPRTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true" "EXPRTest.at:63"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:63: diff -b -B \$abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2b.base stderr"
-echo EXPRTest.at:63 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr" "EXPRTest.at:63"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_14
#AT_START_15
-# 15. EXPRTest.at:64: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)
-at_setup_line='EXPRTest.at:64'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)"
-$at_quiet $as_echo_n " 15: $at_desc"
+at_fn_group_banner 15 'EXPRTest.at:64' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "15. EXPRTest.at:64: testing ..."
+ $as_echo "15. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3653,111 +3340,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:64: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"
-echo EXPRTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true" "EXPRTest.at:64"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:64: mv stdout \$abs_srcdir/expr-testsuite/test.2c.base.tmp"
-echo EXPRTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp" "EXPRTest.at:64"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2c.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:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:64: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"
-echo EXPRTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true" "EXPRTest.at:64"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:64: diff -b -B \$abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2c.base stderr"
-echo EXPRTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr" "EXPRTest.at:64"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_15
#AT_START_16
-# 16. EXPRTest.at:64: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)
-at_setup_line='EXPRTest.at:64'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)"
-$at_quiet $as_echo_n " 16: $at_desc"
+at_fn_group_banner 16 'EXPRTest.at:64' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "16. EXPRTest.at:64: testing ..."
+ $as_echo "16. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3769,111 +3424,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:64: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"
-echo EXPRTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true" "EXPRTest.at:64"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:64: mv stdout \$abs_srcdir/expr-testsuite/test.2c.base.tmp"
-echo EXPRTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp" "EXPRTest.at:64"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2c.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:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:64: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"
-echo EXPRTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true" "EXPRTest.at:64"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:64: diff -b -B \$abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2c.base stderr"
-echo EXPRTest.at:64 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr" "EXPRTest.at:64"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_16
#AT_START_17
-# 17. EXPRTest.at:66: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)
-at_setup_line='EXPRTest.at:66'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)"
-$at_quiet $as_echo_n " 17: $at_desc"
+at_fn_group_banner 17 'EXPRTest.at:66' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "17. EXPRTest.at:66: testing ..."
+ $as_echo "17. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3885,111 +3508,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:66: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"
-echo EXPRTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true" "EXPRTest.at:66"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:66: mv stdout \$abs_srcdir/expr-testsuite/test.2d.base.tmp"
-echo EXPRTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp" "EXPRTest.at:66"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2d.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:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:66: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"
-echo EXPRTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true" "EXPRTest.at:66"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:66: diff -b -B \$abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2d.base stderr"
-echo EXPRTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr" "EXPRTest.at:66"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_17
#AT_START_18
-# 18. EXPRTest.at:66: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)
-at_setup_line='EXPRTest.at:66'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)"
-$at_quiet $as_echo_n " 18: $at_desc"
+at_fn_group_banner 18 'EXPRTest.at:66' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "18. EXPRTest.at:66: testing ..."
+ $as_echo "18. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4001,111 +3592,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:66: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"
-echo EXPRTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true" "EXPRTest.at:66"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:66: mv stdout \$abs_srcdir/expr-testsuite/test.2d.base.tmp"
-echo EXPRTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp" "EXPRTest.at:66"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2d.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:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:66: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"
-echo EXPRTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true" "EXPRTest.at:66"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:66: diff -b -B \$abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2d.base stderr"
-echo EXPRTest.at:66 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr" "EXPRTest.at:66"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_18
#AT_START_19
-# 19. EXPRTest.at:67: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)
-at_setup_line='EXPRTest.at:67'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)"
-$at_quiet $as_echo_n " 19: $at_desc"
+at_fn_group_banner 19 'EXPRTest.at:67' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "19. EXPRTest.at:67: testing ..."
+ $as_echo "19. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4117,111 +3676,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:67: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"
-echo EXPRTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true" "EXPRTest.at:67"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:67: mv stdout \$abs_srcdir/expr-testsuite/test.2e.base.tmp"
-echo EXPRTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp" "EXPRTest.at:67"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2e.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:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:67: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"
-echo EXPRTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true" "EXPRTest.at:67"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:67: diff -b -B \$abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2e.base stderr"
-echo EXPRTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr" "EXPRTest.at:67"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_19
#AT_START_20
-# 20. EXPRTest.at:67: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)
-at_setup_line='EXPRTest.at:67'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)"
-$at_quiet $as_echo_n " 20: $at_desc"
+at_fn_group_banner 20 'EXPRTest.at:67' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "20. EXPRTest.at:67: testing ..."
+ $as_echo "20. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4233,111 +3760,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:67: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"
-echo EXPRTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true" "EXPRTest.at:67"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:67: mv stdout \$abs_srcdir/expr-testsuite/test.2e.base.tmp"
-echo EXPRTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp" "EXPRTest.at:67"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2e.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:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:67: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"
-echo EXPRTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true" "EXPRTest.at:67"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:67: diff -b -B \$abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2e.base stderr"
-echo EXPRTest.at:67 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr" "EXPRTest.at:67"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_20
#AT_START_21
-# 21. EXPRTest.at:69: expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)
-at_setup_line='EXPRTest.at:69'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)"
-$at_quiet $as_echo_n " 21: $at_desc"
+at_fn_group_banner 21 'EXPRTest.at:69' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "21. EXPRTest.at:69: testing ..."
+ $as_echo "21. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4349,111 +3844,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:69: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"
-echo EXPRTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true" "EXPRTest.at:69"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:69: mv stdout \$abs_srcdir/expr-testsuite/test.2f.base.tmp"
-echo EXPRTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp" "EXPRTest.at:69"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2f.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:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:69: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"
-echo EXPRTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true" "EXPRTest.at:69"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:69: diff -b -B \$abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2f.base stderr"
-echo EXPRTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr" "EXPRTest.at:69"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_21
#AT_START_22
-# 22. EXPRTest.at:69: expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)
-at_setup_line='EXPRTest.at:69'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)"
-$at_quiet $as_echo_n " 22: $at_desc"
+at_fn_group_banner 22 'EXPRTest.at:69' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "22. EXPRTest.at:69: testing ..."
+ $as_echo "22. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4465,111 +3928,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:69: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"
-echo EXPRTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true" "EXPRTest.at:69"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:69: mv stdout \$abs_srcdir/expr-testsuite/test.2f.base.tmp"
-echo EXPRTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp" "EXPRTest.at:69"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2f.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:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:69: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"
-echo EXPRTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true" "EXPRTest.at:69"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:69: diff -b -B \$abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2f.base stderr"
-echo EXPRTest.at:69 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr" "EXPRTest.at:69"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_22
#AT_START_23
-# 23. EXPRTest.at:70: expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)
-at_setup_line='EXPRTest.at:70'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)"
-$at_quiet $as_echo_n " 23: $at_desc"
+at_fn_group_banner 23 'EXPRTest.at:70' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "23. EXPRTest.at:70: testing ..."
+ $as_echo "23. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4581,111 +4012,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:70: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"
-echo EXPRTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true" "EXPRTest.at:70"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:70: mv stdout \$abs_srcdir/expr-testsuite/test.3.base.tmp"
-echo EXPRTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp" "EXPRTest.at:70"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.3.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:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:70: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"
-echo EXPRTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true" "EXPRTest.at:70"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:70: diff -b -B \$abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.3.base stderr"
-echo EXPRTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr" "EXPRTest.at:70"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_23
#AT_START_24
-# 24. EXPRTest.at:70: expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)
-at_setup_line='EXPRTest.at:70'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)"
-$at_quiet $as_echo_n " 24: $at_desc"
+at_fn_group_banner 24 'EXPRTest.at:70' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "24. EXPRTest.at:70: testing ..."
+ $as_echo "24. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4697,111 +4096,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:70: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"
-echo EXPRTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true" "EXPRTest.at:70"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:70: mv stdout \$abs_srcdir/expr-testsuite/test.3.base.tmp"
-echo EXPRTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp" "EXPRTest.at:70"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.3.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:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:70: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"
-echo EXPRTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true" "EXPRTest.at:70"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:70: diff -b -B \$abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.3.base stderr"
-echo EXPRTest.at:70 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr" "EXPRTest.at:70"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_24
#AT_START_25
-# 25. EXPRTest.at:71: expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' (pass)
-at_setup_line='EXPRTest.at:71'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass)"
-$at_quiet $as_echo_n " 25: $at_desc"
+at_fn_group_banner 25 'EXPRTest.at:71' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "25. EXPRTest.at:71: testing ..."
+ $as_echo "25. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4813,111 +4180,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:71: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"
-echo EXPRTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true" "EXPRTest.at:71"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:71: mv stdout \$abs_srcdir/expr-testsuite/test.4.base.tmp"
-echo EXPRTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp" "EXPRTest.at:71"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.4.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:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:71: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"
-echo EXPRTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true" "EXPRTest.at:71"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/EXPRTest.at:71: diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stderr"
-echo EXPRTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-
-$at_failed && at_func_log_failure
+ { set +x
+$as_echo "$at_srcdir/EXPRTest.at:71: diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stderr"
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr" "EXPRTest.at:71"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.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:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_25
#AT_START_26
-# 26. EXPRTest.at:71: expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' (pass)
-at_setup_line='EXPRTest.at:71'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass)"
-$at_quiet $as_echo_n " 26: $at_desc"
+at_fn_group_banner 26 'EXPRTest.at:71' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "26. EXPRTest.at:71: testing ..."
+ $as_echo "26. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4929,111 +4264,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:71: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"
-echo EXPRTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true" "EXPRTest.at:71"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:71: mv stdout \$abs_srcdir/expr-testsuite/test.4.base.tmp"
-echo EXPRTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp" "EXPRTest.at:71"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.4.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:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:71: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"
-echo EXPRTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true" "EXPRTest.at:71"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:71: diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stderr"
-echo EXPRTest.at:71 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr" "EXPRTest.at:71"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_26
#AT_START_27
-# 27. EXPRTest.at:80: expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' (pass)
-at_setup_line='EXPRTest.at:80'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass)"
-$at_quiet $as_echo_n " 27: $at_desc"
+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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "27. EXPRTest.at:80: testing ..."
+ $as_echo "27. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5045,111 +4348,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
-$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"
-echo EXPRTest.at:80 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"; then
- ( $at_traceon; $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_stder1"
- at_func_filter_trace $?
-else
- ( :; $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"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/EXPRTest.at:80: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp"
-echo EXPRTest.at:80 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80"
-
-$at_failed && at_func_log_failure
+ { set +x
+$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:81"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
-$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"
-echo EXPRTest.at:80 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"; then
- ( $at_traceon; $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_stder1"
- at_func_filter_trace $?
-else
- ( :; $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"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$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"
-echo EXPRTest.at:80 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr"; then
- ( $at_traceon; 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_stder1"
- at_func_filter_trace $?
-else
- ( :; 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"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_27
#AT_START_28
-# 28. EXPRTest.at:83: expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' (pass)
-at_setup_line='EXPRTest.at:83'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass)"
-$at_quiet $as_echo_n " 28: $at_desc"
+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
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "28. EXPRTest.at:83: testing ..."
+ $as_echo "28. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5161,111 +4432,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
-
- { $at_traceoff
-$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"
-echo EXPRTest.at:83 >"$at_check_line_file"
+ if test -n "$baselines" -a x$baselines = xyes; then :
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"; then
- ( $at_traceon; $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_stder1"
- at_func_filter_trace $?
-else
- ( :; $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"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/EXPRTest.at:83: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp"
-echo EXPRTest.at:83 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83"
-
-$at_failed && at_func_log_failure
+ { set +x
+$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:84"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
-$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"
-echo EXPRTest.at:83 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"; then
- ( $at_traceon; $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_stder1"
- at_func_filter_trace $?
-else
- ( :; $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"
-fi
-at_status=$?
-at_failed=false
+ { set +x
+$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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$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"
-echo EXPRTest.at:83 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr"; then
- ( $at_traceon; 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_stder1"
- at_func_filter_trace $?
-else
- ( :; 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"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+ { set +x
+$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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_28
#AT_START_29
-# 29. EXPRTest.at:89: expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' (pass)
-at_setup_line='EXPRTest.at:89'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass)"
-$at_quiet $as_echo_n " 29: $at_desc"
+at_fn_group_banner 29 'EXPRTest.at:89' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "29. EXPRTest.at:89: testing ..."
+ $as_echo "29. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5277,111 +4516,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:89: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"
-echo EXPRTest.at:89 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true" "EXPRTest.at:89"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:89: mv stdout \$abs_srcdir/expr-testsuite/test.eb.base.tmp"
-echo EXPRTest.at:89 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp" "EXPRTest.at:89"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.eb.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:89"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:89: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"
-echo EXPRTest.at:89 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true" "EXPRTest.at:89"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:89: diff -b -B \$abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.eb.base stderr"
-echo EXPRTest.at:89 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr" "EXPRTest.at:89"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_29
#AT_START_30
-# 30. EXPRTest.at:89: expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' (pass)
-at_setup_line='EXPRTest.at:89'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass)"
-$at_quiet $as_echo_n " 30: $at_desc"
+at_fn_group_banner 30 'EXPRTest.at:89' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "30. EXPRTest.at:89: testing ..."
+ $as_echo "30. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5393,111 +4600,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:89: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"
-echo EXPRTest.at:89 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true" "EXPRTest.at:89"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:89: mv stdout \$abs_srcdir/expr-testsuite/test.eb.base.tmp"
-echo EXPRTest.at:89 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp" "EXPRTest.at:89"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.eb.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:89"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:89: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"
-echo EXPRTest.at:89 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true" "EXPRTest.at:89"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:89: diff -b -B \$abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.eb.base stderr"
-echo EXPRTest.at:89 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr" "EXPRTest.at:89"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_30
#AT_START_31
-# 31. EXPRTest.at:91: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)
-at_setup_line='EXPRTest.at:91'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)"
-$at_quiet $as_echo_n " 31: $at_desc"
+at_fn_group_banner 31 'EXPRTest.at:91' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "31. EXPRTest.at:91: testing ..."
+ $as_echo "31. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5509,111 +4684,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:91: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"
-echo EXPRTest.at:91 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true" "EXPRTest.at:91"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:91: mv stdout \$abs_srcdir/expr-testsuite/test.5.base.tmp"
-echo EXPRTest.at:91 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp" "EXPRTest.at:91"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.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:91"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:91: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"
-echo EXPRTest.at:91 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true" "EXPRTest.at:91"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:91: diff -b -B \$abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.base stderr"
-echo EXPRTest.at:91 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr" "EXPRTest.at:91"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_31
#AT_START_32
-# 32. EXPRTest.at:91: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)
-at_setup_line='EXPRTest.at:91'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)"
-$at_quiet $as_echo_n " 32: $at_desc"
+at_fn_group_banner 32 'EXPRTest.at:91' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "32. EXPRTest.at:91: testing ..."
+ $as_echo "32. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5625,111 +4768,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:91: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"
-echo EXPRTest.at:91 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true" "EXPRTest.at:91"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:91: mv stdout \$abs_srcdir/expr-testsuite/test.5.base.tmp"
-echo EXPRTest.at:91 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp" "EXPRTest.at:91"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.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:91"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:91: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"
-echo EXPRTest.at:91 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true" "EXPRTest.at:91"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:91: diff -b -B \$abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.base stderr"
-echo EXPRTest.at:91 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr" "EXPRTest.at:91"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_32
#AT_START_33
-# 33. EXPRTest.at:92: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)
-at_setup_line='EXPRTest.at:92'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)"
-$at_quiet $as_echo_n " 33: $at_desc"
+at_fn_group_banner 33 'EXPRTest.at:92' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "33. EXPRTest.at:92: testing ..."
+ $as_echo "33. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5741,111 +4852,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:92: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"
-echo EXPRTest.at:92 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true" "EXPRTest.at:92"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:92: mv stdout \$abs_srcdir/expr-testsuite/test.5a.base.tmp"
-echo EXPRTest.at:92 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp" "EXPRTest.at:92"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5a.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:92"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:92: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"
-echo EXPRTest.at:92 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true" "EXPRTest.at:92"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:92: diff -b -B \$abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5a.base stderr"
-echo EXPRTest.at:92 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr" "EXPRTest.at:92"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_33
#AT_START_34
-# 34. EXPRTest.at:92: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)
-at_setup_line='EXPRTest.at:92'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)"
-$at_quiet $as_echo_n " 34: $at_desc"
+at_fn_group_banner 34 'EXPRTest.at:92' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "34. EXPRTest.at:92: testing ..."
+ $as_echo "34. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5857,111 +4936,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:92: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"
-echo EXPRTest.at:92 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true" "EXPRTest.at:92"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:92: mv stdout \$abs_srcdir/expr-testsuite/test.5a.base.tmp"
-echo EXPRTest.at:92 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp" "EXPRTest.at:92"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5a.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:92"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:92: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"
-echo EXPRTest.at:92 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true" "EXPRTest.at:92"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:92: diff -b -B \$abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5a.base stderr"
-echo EXPRTest.at:92 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr" "EXPRTest.at:92"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_34
#AT_START_35
-# 35. EXPRTest.at:93: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i (pass)
-at_setup_line='EXPRTest.at:93'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i (pass)"
-$at_quiet $as_echo_n " 35: $at_desc"
+at_fn_group_banner 35 'EXPRTest.at:93' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "35. EXPRTest.at:93: testing ..."
+ $as_echo "35. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -5973,111 +5020,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:93: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"
-echo EXPRTest.at:93 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true" "EXPRTest.at:93"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:93: mv stdout \$abs_srcdir/expr-testsuite/test.6.base.tmp"
-echo EXPRTest.at:93 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp" "EXPRTest.at:93"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.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:93"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:93: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"
-echo EXPRTest.at:93 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true" "EXPRTest.at:93"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:93: diff -b -B \$abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.base stderr"
-echo EXPRTest.at:93 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr" "EXPRTest.at:93"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_35
#AT_START_36
-# 36. EXPRTest.at:93: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i (pass)
-at_setup_line='EXPRTest.at:93'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i (pass)"
-$at_quiet $as_echo_n " 36: $at_desc"
+at_fn_group_banner 36 'EXPRTest.at:93' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "36. EXPRTest.at:93: testing ..."
+ $as_echo "36. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6089,111 +5104,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:93: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"
-echo EXPRTest.at:93 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true" "EXPRTest.at:93"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:93: mv stdout \$abs_srcdir/expr-testsuite/test.6.base.tmp"
-echo EXPRTest.at:93 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp" "EXPRTest.at:93"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.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:93"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:93: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"
-echo EXPRTest.at:93 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true" "EXPRTest.at:93"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:93: diff -b -B \$abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.base stderr"
-echo EXPRTest.at:93 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr" "EXPRTest.at:93"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_36
#AT_START_37
-# 37. EXPRTest.at:94: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)
-at_setup_line='EXPRTest.at:94'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)"
-$at_quiet $as_echo_n " 37: $at_desc"
+at_fn_group_banner 37 'EXPRTest.at:94' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "37. EXPRTest.at:94: testing ..."
+ $as_echo "37. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6205,111 +5188,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:94: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"
-echo EXPRTest.at:94 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true" "EXPRTest.at:94"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:94: mv stdout \$abs_srcdir/expr-testsuite/test.6a.base.tmp"
-echo EXPRTest.at:94 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp" "EXPRTest.at:94"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6a.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:94"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:94: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"
-echo EXPRTest.at:94 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true" "EXPRTest.at:94"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:94: diff -b -B \$abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6a.base stderr"
-echo EXPRTest.at:94 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr" "EXPRTest.at:94"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_37
#AT_START_38
-# 38. EXPRTest.at:94: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)
-at_setup_line='EXPRTest.at:94'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)"
-$at_quiet $as_echo_n " 38: $at_desc"
+at_fn_group_banner 38 'EXPRTest.at:94' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "38. EXPRTest.at:94: testing ..."
+ $as_echo "38. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6321,111 +5272,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:94: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"
-echo EXPRTest.at:94 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true" "EXPRTest.at:94"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:94: mv stdout \$abs_srcdir/expr-testsuite/test.6a.base.tmp"
-echo EXPRTest.at:94 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp" "EXPRTest.at:94"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6a.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:94"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:94: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"
-echo EXPRTest.at:94 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true" "EXPRTest.at:94"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:94: diff -b -B \$abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6a.base stderr"
-echo EXPRTest.at:94 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr" "EXPRTest.at:94"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_38
#AT_START_39
-# 39. EXPRTest.at:95: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)
-at_setup_line='EXPRTest.at:95'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)"
-$at_quiet $as_echo_n " 39: $at_desc"
+at_fn_group_banner 39 'EXPRTest.at:95' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "39. EXPRTest.at:95: testing ..."
+ $as_echo "39. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6437,111 +5356,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:95: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"
-echo EXPRTest.at:95 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true" "EXPRTest.at:95"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:95: mv stdout \$abs_srcdir/expr-testsuite/test.5b.base.tmp"
-echo EXPRTest.at:95 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp" "EXPRTest.at:95"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5b.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:95"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:95: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"
-echo EXPRTest.at:95 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true" "EXPRTest.at:95"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:95: diff -b -B \$abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5b.base stderr"
-echo EXPRTest.at:95 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr" "EXPRTest.at:95"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_39
#AT_START_40
-# 40. EXPRTest.at:95: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)
-at_setup_line='EXPRTest.at:95'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)"
-$at_quiet $as_echo_n " 40: $at_desc"
+at_fn_group_banner 40 'EXPRTest.at:95' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "40. EXPRTest.at:95: testing ..."
+ $as_echo "40. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6553,111 +5440,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:95: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"
-echo EXPRTest.at:95 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true" "EXPRTest.at:95"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:95: mv stdout \$abs_srcdir/expr-testsuite/test.5b.base.tmp"
-echo EXPRTest.at:95 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp" "EXPRTest.at:95"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5b.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:95"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:95: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"
-echo EXPRTest.at:95 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true" "EXPRTest.at:95"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:95: diff -b -B \$abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5b.base stderr"
-echo EXPRTest.at:95 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr" "EXPRTest.at:95"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_40
#AT_START_41
-# 41. EXPRTest.at:96: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length (pass)
-at_setup_line='EXPRTest.at:96'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass)"
-$at_quiet $as_echo_n " 41: $at_desc"
+at_fn_group_banner 41 'EXPRTest.at:96' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "41. EXPRTest.at:96: testing ..."
+ $as_echo "41. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6669,111 +5524,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:96: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"
-echo EXPRTest.at:96 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true" "EXPRTest.at:96"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:96: mv stdout \$abs_srcdir/expr-testsuite/test.5c.base.tmp"
-echo EXPRTest.at:96 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp" "EXPRTest.at:96"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5c.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:96"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:96: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"
-echo EXPRTest.at:96 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true" "EXPRTest.at:96"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:96: diff -b -B \$abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5c.base stderr"
-echo EXPRTest.at:96 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr" "EXPRTest.at:96"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_41
#AT_START_42
-# 42. EXPRTest.at:96: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length (pass)
-at_setup_line='EXPRTest.at:96'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass)"
-$at_quiet $as_echo_n " 42: $at_desc"
+at_fn_group_banner 42 'EXPRTest.at:96' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "42. EXPRTest.at:96: testing ..."
+ $as_echo "42. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6785,111 +5608,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:96: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"
-echo EXPRTest.at:96 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true" "EXPRTest.at:96"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:96: mv stdout \$abs_srcdir/expr-testsuite/test.5c.base.tmp"
-echo EXPRTest.at:96 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp" "EXPRTest.at:96"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5c.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:96"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:96: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"
-echo EXPRTest.at:96 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true" "EXPRTest.at:96"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:96: diff -b -B \$abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5c.base stderr"
-echo EXPRTest.at:96 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr" "EXPRTest.at:96"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_42
#AT_START_43
-# 43. EXPRTest.at:97: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)
-at_setup_line='EXPRTest.at:97'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)"
-$at_quiet $as_echo_n " 43: $at_desc"
+at_fn_group_banner 43 'EXPRTest.at:97' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "43. EXPRTest.at:97: testing ..."
+ $as_echo "43. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6901,111 +5692,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:97: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"
-echo EXPRTest.at:97 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true" "EXPRTest.at:97"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:97: mv stdout \$abs_srcdir/expr-testsuite/test.5d.base.tmp"
-echo EXPRTest.at:97 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp" "EXPRTest.at:97"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5d.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:97"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:97: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"
-echo EXPRTest.at:97 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true" "EXPRTest.at:97"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:97: diff -b -B \$abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5d.base stderr"
-echo EXPRTest.at:97 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr" "EXPRTest.at:97"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_43
#AT_START_44
-# 44. EXPRTest.at:97: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)
-at_setup_line='EXPRTest.at:97'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)"
-$at_quiet $as_echo_n " 44: $at_desc"
+at_fn_group_banner 44 'EXPRTest.at:97' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "44. EXPRTest.at:97: testing ..."
+ $as_echo "44. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7017,111 +5776,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:97: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"
-echo EXPRTest.at:97 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true" "EXPRTest.at:97"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:97: mv stdout \$abs_srcdir/expr-testsuite/test.5d.base.tmp"
-echo EXPRTest.at:97 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp" "EXPRTest.at:97"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5d.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:97"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:97: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"
-echo EXPRTest.at:97 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true" "EXPRTest.at:97"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:97: diff -b -B \$abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5d.base stderr"
-echo EXPRTest.at:97 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr" "EXPRTest.at:97"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_44
#AT_START_45
-# 45. EXPRTest.at:98: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o (pass)
-at_setup_line='EXPRTest.at:98'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass)"
-$at_quiet $as_echo_n " 45: $at_desc"
+at_fn_group_banner 45 'EXPRTest.at:98' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "45. EXPRTest.at:98: testing ..."
+ $as_echo "45. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7133,111 +5860,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:98: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"
-echo EXPRTest.at:98 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true" "EXPRTest.at:98"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:98: mv stdout \$abs_srcdir/expr-testsuite/test.2g.base.tmp"
-echo EXPRTest.at:98 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp" "EXPRTest.at:98"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2g.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:98"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:98: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"
-echo EXPRTest.at:98 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true" "EXPRTest.at:98"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:98: diff -b -B \$abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2g.base stderr"
-echo EXPRTest.at:98 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr" "EXPRTest.at:98"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_45
#AT_START_46
-# 46. EXPRTest.at:98: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o (pass)
-at_setup_line='EXPRTest.at:98'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass)"
-$at_quiet $as_echo_n " 46: $at_desc"
+at_fn_group_banner 46 'EXPRTest.at:98' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "46. EXPRTest.at:98: testing ..."
+ $as_echo "46. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7249,111 +5944,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:98: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"
-echo EXPRTest.at:98 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true" "EXPRTest.at:98"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:98: mv stdout \$abs_srcdir/expr-testsuite/test.2g.base.tmp"
-echo EXPRTest.at:98 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp" "EXPRTest.at:98"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2g.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:98"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:98: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"
-echo EXPRTest.at:98 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true" "EXPRTest.at:98"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:98: diff -b -B \$abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2g.base stderr"
-echo EXPRTest.at:98 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr" "EXPRTest.at:98"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_46
#AT_START_47
-# 47. EXPRTest.at:99: expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" (pass)
-at_setup_line='EXPRTest.at:99'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass)"
-$at_quiet $as_echo_n " 47: $at_desc"
+at_fn_group_banner 47 'EXPRTest.at:99' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "47. EXPRTest.at:99: testing ..."
+ $as_echo "47. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7365,111 +6028,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:99: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"
-echo EXPRTest.at:99 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true" "EXPRTest.at:99"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:99: mv stdout \$abs_srcdir/expr-testsuite/test.8.base.tmp"
-echo EXPRTest.at:99 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp" "EXPRTest.at:99"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8.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:99"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:99: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"
-echo EXPRTest.at:99 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true" "EXPRTest.at:99"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:99: diff -b -B \$abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8.base stderr"
-echo EXPRTest.at:99 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr" "EXPRTest.at:99"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_47
#AT_START_48
-# 48. EXPRTest.at:99: expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" (pass)
-at_setup_line='EXPRTest.at:99'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass)"
-$at_quiet $as_echo_n " 48: $at_desc"
+at_fn_group_banner 48 'EXPRTest.at:99' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "48. EXPRTest.at:99: testing ..."
+ $as_echo "48. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7481,111 +6112,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:99: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"
-echo EXPRTest.at:99 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true" "EXPRTest.at:99"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:99: mv stdout \$abs_srcdir/expr-testsuite/test.8.base.tmp"
-echo EXPRTest.at:99 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp" "EXPRTest.at:99"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8.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:99"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:99: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"
-echo EXPRTest.at:99 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true" "EXPRTest.at:99"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:99: diff -b -B \$abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8.base stderr"
-echo EXPRTest.at:99 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr" "EXPRTest.at:99"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_48
#AT_START_49
-# 49. EXPRTest.at:100: expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)
-at_setup_line='EXPRTest.at:100'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)"
-$at_quiet $as_echo_n " 49: $at_desc"
+at_fn_group_banner 49 'EXPRTest.at:100' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "49. EXPRTest.at:100: testing ..."
+ $as_echo "49. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7597,111 +6196,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:100: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"
-echo EXPRTest.at:100 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true" "EXPRTest.at:100"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:100: mv stdout \$abs_srcdir/expr-testsuite/test.7.base.tmp"
-echo EXPRTest.at:100 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp" "EXPRTest.at:100"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.7.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:100"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:100: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"
-echo EXPRTest.at:100 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true" "EXPRTest.at:100"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:100: diff -b -B \$abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.7.base stderr"
-echo EXPRTest.at:100 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr" "EXPRTest.at:100"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_49
#AT_START_50
-# 50. EXPRTest.at:100: expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)
-at_setup_line='EXPRTest.at:100'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)"
-$at_quiet $as_echo_n " 50: $at_desc"
+at_fn_group_banner 50 'EXPRTest.at:100' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "50. EXPRTest.at:100: testing ..."
+ $as_echo "50. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7713,111 +6280,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:100: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"
-echo EXPRTest.at:100 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true" "EXPRTest.at:100"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:100: mv stdout \$abs_srcdir/expr-testsuite/test.7.base.tmp"
-echo EXPRTest.at:100 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp" "EXPRTest.at:100"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.7.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:100"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:100: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"
-echo EXPRTest.at:100 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true" "EXPRTest.at:100"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:100: diff -b -B \$abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.7.base stderr"
-echo EXPRTest.at:100 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr" "EXPRTest.at:100"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_50
#AT_START_51
-# 51. EXPRTest.at:101: expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" (pass)
-at_setup_line='EXPRTest.at:101'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass)"
-$at_quiet $as_echo_n " 51: $at_desc"
+at_fn_group_banner 51 'EXPRTest.at:101' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "51. EXPRTest.at:101: testing ..."
+ $as_echo "51. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7829,111 +6364,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:101: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"
-echo EXPRTest.at:101 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true" "EXPRTest.at:101"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:101: mv stdout \$abs_srcdir/expr-testsuite/test.8a.base.tmp"
-echo EXPRTest.at:101 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp" "EXPRTest.at:101"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8a.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:101"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:101: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"
-echo EXPRTest.at:101 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true" "EXPRTest.at:101"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:101: diff -b -B \$abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8a.base stderr"
-echo EXPRTest.at:101 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr" "EXPRTest.at:101"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_51
#AT_START_52
-# 52. EXPRTest.at:101: expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" (pass)
-at_setup_line='EXPRTest.at:101'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass)"
-$at_quiet $as_echo_n " 52: $at_desc"
+at_fn_group_banner 52 'EXPRTest.at:101' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "52. EXPRTest.at:101: testing ..."
+ $as_echo "52. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7945,111 +6448,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:101: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"
-echo EXPRTest.at:101 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true" "EXPRTest.at:101"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:101: mv stdout \$abs_srcdir/expr-testsuite/test.8a.base.tmp"
-echo EXPRTest.at:101 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp" "EXPRTest.at:101"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8a.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:101"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:101: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"
-echo EXPRTest.at:101 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true" "EXPRTest.at:101"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:101: diff -b -B \$abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8a.base stderr"
-echo EXPRTest.at:101 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr" "EXPRTest.at:101"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_52
#AT_START_53
-# 53. EXPRTest.at:102: expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" (pass)
-at_setup_line='EXPRTest.at:102'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass)"
-$at_quiet $as_echo_n " 53: $at_desc"
+at_fn_group_banner 53 'EXPRTest.at:102' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "53. EXPRTest.at:102: testing ..."
+ $as_echo "53. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8061,111 +6532,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:102: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"
-echo EXPRTest.at:102 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true" "EXPRTest.at:102"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:102: mv stdout \$abs_srcdir/expr-testsuite/test.8b.base.tmp"
-echo EXPRTest.at:102 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp" "EXPRTest.at:102"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8b.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:102"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:102: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"
-echo EXPRTest.at:102 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true" "EXPRTest.at:102"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:102: diff -b -B \$abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8b.base stderr"
-echo EXPRTest.at:102 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr" "EXPRTest.at:102"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_53
#AT_START_54
-# 54. EXPRTest.at:102: expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" (pass)
-at_setup_line='EXPRTest.at:102'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass)"
-$at_quiet $as_echo_n " 54: $at_desc"
+at_fn_group_banner 54 'EXPRTest.at:102' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "54. EXPRTest.at:102: testing ..."
+ $as_echo "54. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8177,111 +6616,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:102: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"
-echo EXPRTest.at:102 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true" "EXPRTest.at:102"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:102: mv stdout \$abs_srcdir/expr-testsuite/test.8b.base.tmp"
-echo EXPRTest.at:102 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp" "EXPRTest.at:102"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8b.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:102"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:102: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"
-echo EXPRTest.at:102 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true" "EXPRTest.at:102"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:102: diff -b -B \$abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8b.base stderr"
-echo EXPRTest.at:102 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr" "EXPRTest.at:102"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_54
#AT_START_55
-# 55. EXPRTest.at:103: expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" (pass)
-at_setup_line='EXPRTest.at:103'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" (pass)"
-$at_quiet $as_echo_n " 55: $at_desc"
+at_fn_group_banner 55 'EXPRTest.at:103' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "55. EXPRTest.at:103: testing ..."
+ $as_echo "55. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8293,111 +6700,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:103: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"
-echo EXPRTest.at:103 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true" "EXPRTest.at:103"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0: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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:103: mv stdout \$abs_srcdir/expr-testsuite/test.9.base.tmp"
-echo EXPRTest.at:103 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp" "EXPRTest.at:103"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.9.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:103"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:103: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"
-echo EXPRTest.at:103 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true" "EXPRTest.at:103"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0: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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:103: diff -b -B \$abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.9.base stderr"
-echo EXPRTest.at:103 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr" "EXPRTest.at:103"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_55
#AT_START_56
-# 56. EXPRTest.at:103: expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" (pass)
-at_setup_line='EXPRTest.at:103'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" (pass)"
-$at_quiet $as_echo_n " 56: $at_desc"
+at_fn_group_banner 56 'EXPRTest.at:103' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "56. EXPRTest.at:103: testing ..."
+ $as_echo "56. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8409,111 +6784,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:103: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"
-echo EXPRTest.at:103 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true" "EXPRTest.at:103"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0: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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:103: mv stdout \$abs_srcdir/expr-testsuite/test.9.base.tmp"
-echo EXPRTest.at:103 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp" "EXPRTest.at:103"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.9.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:103"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:103: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"
-echo EXPRTest.at:103 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true" "EXPRTest.at:103"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0: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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:103: diff -b -B \$abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.9.base stderr"
-echo EXPRTest.at:103 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr" "EXPRTest.at:103"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_56
#AT_START_57
-# 57. EXPRTest.at:104: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)
-at_setup_line='EXPRTest.at:104'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)"
-$at_quiet $as_echo_n " 57: $at_desc"
+at_fn_group_banner 57 'EXPRTest.at:104' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "57. EXPRTest.at:104: testing ..."
+ $as_echo "57. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8525,111 +6868,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:104: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"
-echo EXPRTest.at:104 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true" "EXPRTest.at:104"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:104: mv stdout \$abs_srcdir/expr-testsuite/test.5e.base.tmp"
-echo EXPRTest.at:104 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp" "EXPRTest.at:104"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5e.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:104"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:104: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"
-echo EXPRTest.at:104 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true" "EXPRTest.at:104"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:104: diff -b -B \$abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5e.base stderr"
-echo EXPRTest.at:104 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr" "EXPRTest.at:104"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_57
#AT_START_58
-# 58. EXPRTest.at:104: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)
-at_setup_line='EXPRTest.at:104'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)"
-$at_quiet $as_echo_n " 58: $at_desc"
+at_fn_group_banner 58 'EXPRTest.at:104' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "58. EXPRTest.at:104: testing ..."
+ $as_echo "58. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8641,111 +6952,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:104: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"
-echo EXPRTest.at:104 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true" "EXPRTest.at:104"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:104: mv stdout \$abs_srcdir/expr-testsuite/test.5e.base.tmp"
-echo EXPRTest.at:104 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp" "EXPRTest.at:104"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5e.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:104"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:104: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"
-echo EXPRTest.at:104 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true" "EXPRTest.at:104"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:104: diff -b -B \$abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5e.base stderr"
-echo EXPRTest.at:104 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr" "EXPRTest.at:104"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_58
#AT_START_59
-# 59. EXPRTest.at:105: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)
-at_setup_line='EXPRTest.at:105'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)"
-$at_quiet $as_echo_n " 59: $at_desc"
+at_fn_group_banner 59 'EXPRTest.at:105' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "59. EXPRTest.at:105: testing ..."
+ $as_echo "59. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8757,111 +7036,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:105: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"
-echo EXPRTest.at:105 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true" "EXPRTest.at:105"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:105: mv stdout \$abs_srcdir/expr-testsuite/test.6b.base.tmp"
-echo EXPRTest.at:105 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp" "EXPRTest.at:105"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6b.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:105"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:105: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"
-echo EXPRTest.at:105 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true" "EXPRTest.at:105"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:105: diff -b -B \$abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6b.base stderr"
-echo EXPRTest.at:105 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr" "EXPRTest.at:105"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_59
#AT_START_60
-# 60. EXPRTest.at:105: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)
-at_setup_line='EXPRTest.at:105'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)"
-$at_quiet $as_echo_n " 60: $at_desc"
+at_fn_group_banner 60 'EXPRTest.at:105' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "60. EXPRTest.at:105: testing ..."
+ $as_echo "60. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8873,111 +7120,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:105: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"
-echo EXPRTest.at:105 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true" "EXPRTest.at:105"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:105: mv stdout \$abs_srcdir/expr-testsuite/test.6b.base.tmp"
-echo EXPRTest.at:105 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp" "EXPRTest.at:105"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6b.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:105"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:105: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"
-echo EXPRTest.at:105 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true" "EXPRTest.at:105"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:105: diff -b -B \$abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6b.base stderr"
-echo EXPRTest.at:105 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr" "EXPRTest.at:105"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_60
#AT_START_61
-# 61. EXPRTest.at:109: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) (pass)
-at_setup_line='EXPRTest.at:109'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass)"
-$at_quiet $as_echo_n " 61: $at_desc"
+at_fn_group_banner 61 'EXPRTest.at:109' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "61. EXPRTest.at:109: testing ..."
+ $as_echo "61. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8989,111 +7204,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:109: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"
-echo EXPRTest.at:109 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true" "EXPRTest.at:109"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:109: mv stdout \$abs_srcdir/expr-testsuite/test.6.func1.base.tmp"
-echo EXPRTest.at:109 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp" "EXPRTest.at:109"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.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:109"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:109: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"
-echo EXPRTest.at:109 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true" "EXPRTest.at:109"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:109: diff -b -B \$abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.func1.base stderr"
-echo EXPRTest.at:109 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr" "EXPRTest.at:109"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_61
#AT_START_62
-# 62. EXPRTest.at:109: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) (pass)
-at_setup_line='EXPRTest.at:109'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass)"
-$at_quiet $as_echo_n " 62: $at_desc"
+at_fn_group_banner 62 'EXPRTest.at:109' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "62. EXPRTest.at:109: testing ..."
+ $as_echo "62. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9105,111 +7288,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:109: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"
-echo EXPRTest.at:109 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true" "EXPRTest.at:109"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:109: mv stdout \$abs_srcdir/expr-testsuite/test.6.func1.base.tmp"
-echo EXPRTest.at:109 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp" "EXPRTest.at:109"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.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:109"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:109: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"
-echo EXPRTest.at:109 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true" "EXPRTest.at:109"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:109: diff -b -B \$abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.func1.base stderr"
-echo EXPRTest.at:109 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr" "EXPRTest.at:109"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_62
#AT_START_63
-# 63. EXPRTest.at:110: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) (pass)
-at_setup_line='EXPRTest.at:110'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass)"
-$at_quiet $as_echo_n " 63: $at_desc"
+at_fn_group_banner 63 'EXPRTest.at:110' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "63. EXPRTest.at:110: testing ..."
+ $as_echo "63. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9221,111 +7372,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:110: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"
-echo EXPRTest.at:110 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true" "EXPRTest.at:110"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:110: mv stdout \$abs_srcdir/expr-testsuite/test.6.func2.base.tmp"
-echo EXPRTest.at:110 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp" "EXPRTest.at:110"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.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:110"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:110: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"
-echo EXPRTest.at:110 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true" "EXPRTest.at:110"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:110: diff -b -B \$abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.func2.base stderr"
-echo EXPRTest.at:110 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr" "EXPRTest.at:110"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_63
#AT_START_64
-# 64. EXPRTest.at:110: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) (pass)
-at_setup_line='EXPRTest.at:110'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass)"
-$at_quiet $as_echo_n " 64: $at_desc"
+at_fn_group_banner 64 'EXPRTest.at:110' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "64. EXPRTest.at:110: testing ..."
+ $as_echo "64. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9337,111 +7456,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:110: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"
-echo EXPRTest.at:110 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true" "EXPRTest.at:110"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:110: mv stdout \$abs_srcdir/expr-testsuite/test.6.func2.base.tmp"
-echo EXPRTest.at:110 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp" "EXPRTest.at:110"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.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:110"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:110: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"
-echo EXPRTest.at:110 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true" "EXPRTest.at:110"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:110: diff -b -B \$abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.func2.base stderr"
-echo EXPRTest.at:110 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr" "EXPRTest.at:110"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_64
#AT_START_65
-# 65. EXPRTest.at:112: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) (pass)
-at_setup_line='EXPRTest.at:112'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass)"
-$at_quiet $as_echo_n " 65: $at_desc"
+at_fn_group_banner 65 'EXPRTest.at:112' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "65. EXPRTest.at:112: testing ..."
+ $as_echo "65. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9453,111 +7540,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:112: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"
-echo EXPRTest.at:112 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true" "EXPRTest.at:112"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:112: mv stdout \$abs_srcdir/expr-testsuite/test.5.func3.base.tmp"
-echo EXPRTest.at:112 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp" "EXPRTest.at:112"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.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:112"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:112: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"
-echo EXPRTest.at:112 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true" "EXPRTest.at:112"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:112: diff -b -B \$abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.func3.base stderr"
-echo EXPRTest.at:112 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr" "EXPRTest.at:112"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_65
#AT_START_66
-# 66. EXPRTest.at:112: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) (pass)
-at_setup_line='EXPRTest.at:112'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass)"
-$at_quiet $as_echo_n " 66: $at_desc"
+at_fn_group_banner 66 'EXPRTest.at:112' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "66. EXPRTest.at:112: testing ..."
+ $as_echo "66. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9569,111 +7624,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:112: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"
-echo EXPRTest.at:112 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true" "EXPRTest.at:112"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:112: mv stdout \$abs_srcdir/expr-testsuite/test.5.func3.base.tmp"
-echo EXPRTest.at:112 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp" "EXPRTest.at:112"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.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:112"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:112: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"
-echo EXPRTest.at:112 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true" "EXPRTest.at:112"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:112: diff -b -B \$abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.func3.base stderr"
-echo EXPRTest.at:112 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr" "EXPRTest.at:112"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_66
#AT_START_67
-# 67. EXPRTest.at:114: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) (pass)
-at_setup_line='EXPRTest.at:114'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)"
-$at_quiet $as_echo_n " 67: $at_desc"
+at_fn_group_banner 67 'EXPRTest.at:114' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "67. EXPRTest.at:114: testing ..."
+ $as_echo "67. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9685,111 +7708,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:114: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"
-echo EXPRTest.at:114 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true" "EXPRTest.at:114"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:114: mv stdout \$abs_srcdir/expr-testsuite/test.5.func4.base.tmp"
-echo EXPRTest.at:114 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp" "EXPRTest.at:114"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.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:114"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:114: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"
-echo EXPRTest.at:114 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true" "EXPRTest.at:114"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:114: diff -b -B \$abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.func4.base stderr"
-echo EXPRTest.at:114 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr" "EXPRTest.at:114"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_67
#AT_START_68
-# 68. EXPRTest.at:114: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) (pass)
-at_setup_line='EXPRTest.at:114'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)"
-$at_quiet $as_echo_n " 68: $at_desc"
+at_fn_group_banner 68 'EXPRTest.at:114' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "68. EXPRTest.at:114: testing ..."
+ $as_echo "68. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9801,111 +7792,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:114: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"
-echo EXPRTest.at:114 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true" "EXPRTest.at:114"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:114: mv stdout \$abs_srcdir/expr-testsuite/test.5.func4.base.tmp"
-echo EXPRTest.at:114 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp" "EXPRTest.at:114"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.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:114"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:114: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"
-echo EXPRTest.at:114 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true" "EXPRTest.at:114"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:114: diff -b -B \$abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.func4.base stderr"
-echo EXPRTest.at:114 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr" "EXPRTest.at:114"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_68
#AT_START_69
-# 69. EXPRTest.at:116: expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b (pass)
-at_setup_line='EXPRTest.at:116'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)"
-$at_quiet $as_echo_n " 69: $at_desc"
+at_fn_group_banner 69 'EXPRTest.at:116' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "69. EXPRTest.at:116: testing ..."
+ $as_echo "69. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9917,111 +7876,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:116: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:116 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:116"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:116: mv stdout \$abs_srcdir/expr-testsuite/test.a.base.tmp"
-echo EXPRTest.at:116 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp" "EXPRTest.at:116"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.a.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:116"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:116: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:116 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:116"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:116: diff -b -B \$abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.a.base stderr"
-echo EXPRTest.at:116 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr" "EXPRTest.at:116"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_69
#AT_START_70
-# 70. EXPRTest.at:116: expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b (pass)
-at_setup_line='EXPRTest.at:116'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)"
-$at_quiet $as_echo_n " 70: $at_desc"
+at_fn_group_banner 70 'EXPRTest.at:116' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "70. EXPRTest.at:116: testing ..."
+ $as_echo "70. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10033,111 +7960,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:116: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:116 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:116"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:116: mv stdout \$abs_srcdir/expr-testsuite/test.a.base.tmp"
-echo EXPRTest.at:116 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp" "EXPRTest.at:116"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.a.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:116"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:116: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:116 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:116"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:116: diff -b -B \$abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.a.base stderr"
-echo EXPRTest.at:116 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr" "EXPRTest.at:116"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_70
#AT_START_71
-# 71. EXPRTest.at:117: expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:117'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 71: $at_desc"
+at_fn_group_banner 71 'EXPRTest.at:117' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "71. EXPRTest.at:117: testing ..."
+ $as_echo "71. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10149,111 +8044,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:117: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:117 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:117"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:117: mv stdout \$abs_srcdir/expr-testsuite/test.aa.base.tmp"
-echo EXPRTest.at:117 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp" "EXPRTest.at:117"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.aa.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:117"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:117: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:117 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:117"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:117: diff -b -B \$abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.aa.base stderr"
-echo EXPRTest.at:117 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr" "EXPRTest.at:117"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_71
#AT_START_72
-# 72. EXPRTest.at:117: expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:117'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 72: $at_desc"
+at_fn_group_banner 72 'EXPRTest.at:117' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "72. EXPRTest.at:117: testing ..."
+ $as_echo "72. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10265,111 +8128,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:117: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:117 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:117"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:117: mv stdout \$abs_srcdir/expr-testsuite/test.aa.base.tmp"
-echo EXPRTest.at:117 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp" "EXPRTest.at:117"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.aa.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:117"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:117: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:117 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:117"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:117: diff -b -B \$abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.aa.base stderr"
-echo EXPRTest.at:117 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr" "EXPRTest.at:117"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_72
#AT_START_73
-# 73. EXPRTest.at:118: expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b (pass)
-at_setup_line='EXPRTest.at:118'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass)"
-$at_quiet $as_echo_n " 73: $at_desc"
+at_fn_group_banner 73 'EXPRTest.at:118' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "73. EXPRTest.at:118: testing ..."
+ $as_echo "73. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10381,111 +8212,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:118: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:118 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true" "EXPRTest.at:118"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:118: mv stdout \$abs_srcdir/expr-testsuite/test.ab.base.tmp"
-echo EXPRTest.at:118 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp" "EXPRTest.at:118"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ab.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:118"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:118: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:118 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true" "EXPRTest.at:118"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:118: diff -b -B \$abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ab.base stderr"
-echo EXPRTest.at:118 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr" "EXPRTest.at:118"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_73
#AT_START_74
-# 74. EXPRTest.at:118: expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b (pass)
-at_setup_line='EXPRTest.at:118'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass)"
-$at_quiet $as_echo_n " 74: $at_desc"
+at_fn_group_banner 74 'EXPRTest.at:118' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "74. EXPRTest.at:118: testing ..."
+ $as_echo "74. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10497,111 +8296,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:118: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:118 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true" "EXPRTest.at:118"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:118: mv stdout \$abs_srcdir/expr-testsuite/test.ab.base.tmp"
-echo EXPRTest.at:118 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp" "EXPRTest.at:118"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ab.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:118"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:118: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:118 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true" "EXPRTest.at:118"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:118: diff -b -B \$abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ab.base stderr"
-echo EXPRTest.at:118 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr" "EXPRTest.at:118"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_74
#AT_START_75
-# 75. EXPRTest.at:119: expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b (pass)
-at_setup_line='EXPRTest.at:119'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass)"
-$at_quiet $as_echo_n " 75: $at_desc"
+at_fn_group_banner 75 'EXPRTest.at:119' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "75. EXPRTest.at:119: testing ..."
+ $as_echo "75. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10613,111 +8380,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:119: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:119 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:119"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:119: mv stdout \$abs_srcdir/expr-testsuite/test.ac.base.tmp"
-echo EXPRTest.at:119 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp" "EXPRTest.at:119"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ac.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:119"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:119: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:119 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:119"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:119: diff -b -B \$abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ac.base stderr"
-echo EXPRTest.at:119 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr" "EXPRTest.at:119"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_75
#AT_START_76
-# 76. EXPRTest.at:119: expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b (pass)
-at_setup_line='EXPRTest.at:119'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass)"
-$at_quiet $as_echo_n " 76: $at_desc"
+at_fn_group_banner 76 'EXPRTest.at:119' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "76. EXPRTest.at:119: testing ..."
+ $as_echo "76. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10729,111 +8464,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:119: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:119 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:119"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:119: mv stdout \$abs_srcdir/expr-testsuite/test.ac.base.tmp"
-echo EXPRTest.at:119 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp" "EXPRTest.at:119"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ac.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:119"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:119: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:119 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:119"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:119: diff -b -B \$abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ac.base stderr"
-echo EXPRTest.at:119 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr" "EXPRTest.at:119"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_76
#AT_START_77
-# 77. EXPRTest.at:120: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b (pass)
-at_setup_line='EXPRTest.at:120'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)"
-$at_quiet $as_echo_n " 77: $at_desc"
+at_fn_group_banner 77 'EXPRTest.at:120' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "77. EXPRTest.at:120: testing ..."
+ $as_echo "77. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10845,111 +8548,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:120: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:120 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:120"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:120: mv stdout \$abs_srcdir/expr-testsuite/test.b.base.tmp"
-echo EXPRTest.at:120 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp" "EXPRTest.at:120"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.b.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:120"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:120: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:120 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:120"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:120: diff -b -B \$abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.b.base stderr"
-echo EXPRTest.at:120 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr" "EXPRTest.at:120"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_77
#AT_START_78
-# 78. EXPRTest.at:120: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b (pass)
-at_setup_line='EXPRTest.at:120'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)"
-$at_quiet $as_echo_n " 78: $at_desc"
+at_fn_group_banner 78 'EXPRTest.at:120' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "78. EXPRTest.at:120: testing ..."
+ $as_echo "78. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10961,111 +8632,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:120: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:120 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:120"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:120: mv stdout \$abs_srcdir/expr-testsuite/test.b.base.tmp"
-echo EXPRTest.at:120 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp" "EXPRTest.at:120"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.b.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:120"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:120: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:120 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:120"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:120: diff -b -B \$abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.b.base stderr"
-echo EXPRTest.at:120 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr" "EXPRTest.at:120"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_78
#AT_START_79
-# 79. EXPRTest.at:121: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b (pass)
-at_setup_line='EXPRTest.at:121'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass)"
-$at_quiet $as_echo_n " 79: $at_desc"
+at_fn_group_banner 79 'EXPRTest.at:121' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "79. EXPRTest.at:121: testing ..."
+ $as_echo "79. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11077,111 +8716,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:121: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"
-echo EXPRTest.at:121 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true" "EXPRTest.at:121"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:121: mv stdout \$abs_srcdir/expr-testsuite/test.ba.base.tmp"
-echo EXPRTest.at:121 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp" "EXPRTest.at:121"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ba.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:121"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:121: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"
-echo EXPRTest.at:121 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true" "EXPRTest.at:121"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:121: diff -b -B \$abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ba.base stderr"
-echo EXPRTest.at:121 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr" "EXPRTest.at:121"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_79
#AT_START_80
-# 80. EXPRTest.at:121: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b (pass)
-at_setup_line='EXPRTest.at:121'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass)"
-$at_quiet $as_echo_n " 80: $at_desc"
+at_fn_group_banner 80 'EXPRTest.at:121' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "80. EXPRTest.at:121: testing ..."
+ $as_echo "80. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11193,111 +8800,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:121: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"
-echo EXPRTest.at:121 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true" "EXPRTest.at:121"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:121: mv stdout \$abs_srcdir/expr-testsuite/test.ba.base.tmp"
-echo EXPRTest.at:121 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp" "EXPRTest.at:121"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ba.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:121"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:121: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"
-echo EXPRTest.at:121 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true" "EXPRTest.at:121"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:121: diff -b -B \$abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ba.base stderr"
-echo EXPRTest.at:121 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr" "EXPRTest.at:121"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_80
#AT_START_81
-# 81. EXPRTest.at:122: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:122'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 81: $at_desc"
+at_fn_group_banner 81 'EXPRTest.at:122' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "81. EXPRTest.at:122: testing ..."
+ $as_echo "81. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11309,111 +8884,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:122: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:122 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:122"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:122: mv stdout \$abs_srcdir/expr-testsuite/test.bb.base.tmp"
-echo EXPRTest.at:122 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp" "EXPRTest.at:122"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bb.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:122"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:122: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:122 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:122"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:122: diff -b -B \$abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bb.base stderr"
-echo EXPRTest.at:122 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr" "EXPRTest.at:122"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_81
#AT_START_82
-# 82. EXPRTest.at:122: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:122'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 82: $at_desc"
+at_fn_group_banner 82 'EXPRTest.at:122' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "82. EXPRTest.at:122: testing ..."
+ $as_echo "82. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11425,111 +8968,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:122: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:122 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:122"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:122: mv stdout \$abs_srcdir/expr-testsuite/test.bb.base.tmp"
-echo EXPRTest.at:122 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp" "EXPRTest.at:122"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bb.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:122"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:122: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:122 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:122"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:122: diff -b -B \$abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bb.base stderr"
-echo EXPRTest.at:122 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr" "EXPRTest.at:122"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_82
#AT_START_83
-# 83. EXPRTest.at:123: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b (pass)
-at_setup_line='EXPRTest.at:123'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass)"
-$at_quiet $as_echo_n " 83: $at_desc"
+at_fn_group_banner 83 'EXPRTest.at:123' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "83. EXPRTest.at:123: testing ..."
+ $as_echo "83. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11541,111 +9052,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:123: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:123 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:123"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:123: mv stdout \$abs_srcdir/expr-testsuite/test.bc.base.tmp"
-echo EXPRTest.at:123 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp" "EXPRTest.at:123"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bc.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:123"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:123: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:123 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:123"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:123: diff -b -B \$abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bc.base stderr"
-echo EXPRTest.at:123 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr" "EXPRTest.at:123"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_83
#AT_START_84
-# 84. EXPRTest.at:123: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b (pass)
-at_setup_line='EXPRTest.at:123'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass)"
-$at_quiet $as_echo_n " 84: $at_desc"
+at_fn_group_banner 84 'EXPRTest.at:123' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "84. EXPRTest.at:123: testing ..."
+ $as_echo "84. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11657,111 +9136,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:123: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:123 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:123"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:123: mv stdout \$abs_srcdir/expr-testsuite/test.bc.base.tmp"
-echo EXPRTest.at:123 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp" "EXPRTest.at:123"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bc.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:123"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:123: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:123 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:123"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:123: diff -b -B \$abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bc.base stderr"
-echo EXPRTest.at:123 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr" "EXPRTest.at:123"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_84
#AT_START_85
-# 85. EXPRTest.at:124: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:124'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 85: $at_desc"
+at_fn_group_banner 85 'EXPRTest.at:124' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "85. EXPRTest.at:124: testing ..."
+ $as_echo "85. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11773,111 +9220,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:124: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:124 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:124"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:124: mv stdout \$abs_srcdir/expr-testsuite/test.bd.base.tmp"
-echo EXPRTest.at:124 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp" "EXPRTest.at:124"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bd.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:124"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:124: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:124 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:124"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
-$as_echo "$at_srcdir/EXPRTest.at:124: diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stderr"
-echo EXPRTest.at:124 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-
-$at_failed && at_func_log_failure
+ { set +x
+$as_echo "$at_srcdir/EXPRTest.at:124: diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stderr"
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr" "EXPRTest.at:124"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.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:124"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_85
#AT_START_86
-# 86. EXPRTest.at:124: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:124'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 86: $at_desc"
+at_fn_group_banner 86 'EXPRTest.at:124' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "86. EXPRTest.at:124: testing ..."
+ $as_echo "86. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11889,111 +9304,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:124: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:124 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:124"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:124: mv stdout \$abs_srcdir/expr-testsuite/test.bd.base.tmp"
-echo EXPRTest.at:124 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp" "EXPRTest.at:124"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bd.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:124"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:124: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:124 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:124"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:124: diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stderr"
-echo EXPRTest.at:124 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr" "EXPRTest.at:124"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_86
#AT_START_87
-# 87. EXPRTest.at:125: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b (pass)
-at_setup_line='EXPRTest.at:125'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass)"
-$at_quiet $as_echo_n " 87: $at_desc"
+at_fn_group_banner 87 'EXPRTest.at:125' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "87. EXPRTest.at:125: testing ..."
+ $as_echo "87. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12005,111 +9388,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:125: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:125 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:125"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:125: mv stdout \$abs_srcdir/expr-testsuite/test.be.base.tmp"
-echo EXPRTest.at:125 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp" "EXPRTest.at:125"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.be.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:125"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:125: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:125 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:125"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:125: diff -b -B \$abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.be.base stderr"
-echo EXPRTest.at:125 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr" "EXPRTest.at:125"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_87
#AT_START_88
-# 88. EXPRTest.at:125: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b (pass)
-at_setup_line='EXPRTest.at:125'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass)"
-$at_quiet $as_echo_n " 88: $at_desc"
+at_fn_group_banner 88 'EXPRTest.at:125' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "88. EXPRTest.at:125: testing ..."
+ $as_echo "88. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12121,111 +9472,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:125: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:125 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:125"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:125: mv stdout \$abs_srcdir/expr-testsuite/test.be.base.tmp"
-echo EXPRTest.at:125 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp" "EXPRTest.at:125"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.be.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:125"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:125: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:125 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:125"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:125: diff -b -B \$abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.be.base stderr"
-echo EXPRTest.at:125 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr" "EXPRTest.at:125"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_88
#AT_START_89
-# 89. EXPRTest.at:126: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b (pass)
-at_setup_line='EXPRTest.at:126'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)"
-$at_quiet $as_echo_n " 89: $at_desc"
+at_fn_group_banner 89 'EXPRTest.at:126' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "89. EXPRTest.at:126: testing ..."
+ $as_echo "89. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12237,111 +9556,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:126: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:126 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:126"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:126: mv stdout \$abs_srcdir/expr-testsuite/test.d.base.tmp"
-echo EXPRTest.at:126 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp" "EXPRTest.at:126"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.d.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:126"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:126: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:126 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:126"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:126: diff -b -B \$abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.d.base stderr"
-echo EXPRTest.at:126 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr" "EXPRTest.at:126"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_89
#AT_START_90
-# 90. EXPRTest.at:126: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b (pass)
-at_setup_line='EXPRTest.at:126'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)"
-$at_quiet $as_echo_n " 90: $at_desc"
+at_fn_group_banner 90 'EXPRTest.at:126' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "90. EXPRTest.at:126: testing ..."
+ $as_echo "90. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12353,111 +9640,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:126: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:126 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:126"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:126: mv stdout \$abs_srcdir/expr-testsuite/test.d.base.tmp"
-echo EXPRTest.at:126 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp" "EXPRTest.at:126"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.d.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:126"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:126: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"
-echo EXPRTest.at:126 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:126"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:126: diff -b -B \$abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.d.base stderr"
-echo EXPRTest.at:126 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr" "EXPRTest.at:126"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_90
#AT_START_91
-# 91. EXPRTest.at:127: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b (pass)
-at_setup_line='EXPRTest.at:127'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass)"
-$at_quiet $as_echo_n " 91: $at_desc"
+at_fn_group_banner 91 'EXPRTest.at:127' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "91. EXPRTest.at:127: testing ..."
+ $as_echo "91. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12469,111 +9724,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:127: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"
-echo EXPRTest.at:127 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true" "EXPRTest.at:127"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:127: mv stdout \$abs_srcdir/expr-testsuite/test.da.base.tmp"
-echo EXPRTest.at:127 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp" "EXPRTest.at:127"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.da.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:127"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:127: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"
-echo EXPRTest.at:127 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true" "EXPRTest.at:127"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:127: diff -b -B \$abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.da.base stderr"
-echo EXPRTest.at:127 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr" "EXPRTest.at:127"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_91
#AT_START_92
-# 92. EXPRTest.at:127: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b (pass)
-at_setup_line='EXPRTest.at:127'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass)"
-$at_quiet $as_echo_n " 92: $at_desc"
+at_fn_group_banner 92 'EXPRTest.at:127' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "92. EXPRTest.at:127: testing ..."
+ $as_echo "92. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12585,111 +9808,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:127: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"
-echo EXPRTest.at:127 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true" "EXPRTest.at:127"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:127: mv stdout \$abs_srcdir/expr-testsuite/test.da.base.tmp"
-echo EXPRTest.at:127 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp" "EXPRTest.at:127"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.da.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:127"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:127: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"
-echo EXPRTest.at:127 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true" "EXPRTest.at:127"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:127: diff -b -B \$abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.da.base stderr"
-echo EXPRTest.at:127 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr" "EXPRTest.at:127"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_92
#AT_START_93
-# 93. EXPRTest.at:128: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:128'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 93: $at_desc"
+at_fn_group_banner 93 'EXPRTest.at:128' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "93. EXPRTest.at:128: testing ..."
+ $as_echo "93. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12701,111 +9892,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:128: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:128 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:128"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:128: mv stdout \$abs_srcdir/expr-testsuite/test.db.base.tmp"
-echo EXPRTest.at:128 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp" "EXPRTest.at:128"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.db.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:128"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:128: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:128 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:128"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:128: diff -b -B \$abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.db.base stderr"
-echo EXPRTest.at:128 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr" "EXPRTest.at:128"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_93
#AT_START_94
-# 94. EXPRTest.at:128: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:128'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 94: $at_desc"
+at_fn_group_banner 94 'EXPRTest.at:128' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "94. EXPRTest.at:128: testing ..."
+ $as_echo "94. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12817,111 +9976,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:128: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:128 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:128"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:128: mv stdout \$abs_srcdir/expr-testsuite/test.db.base.tmp"
-echo EXPRTest.at:128 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp" "EXPRTest.at:128"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.db.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:128"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:128: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:128 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:128"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:128: diff -b -B \$abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.db.base stderr"
-echo EXPRTest.at:128 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr" "EXPRTest.at:128"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_94
#AT_START_95
-# 95. EXPRTest.at:129: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b (pass)
-at_setup_line='EXPRTest.at:129'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass)"
-$at_quiet $as_echo_n " 95: $at_desc"
+at_fn_group_banner 95 'EXPRTest.at:129' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "95. EXPRTest.at:129: testing ..."
+ $as_echo "95. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12933,111 +10060,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:129: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:129 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:129"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:129: mv stdout \$abs_srcdir/expr-testsuite/test.dc.base.tmp"
-echo EXPRTest.at:129 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp" "EXPRTest.at:129"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dc.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:129"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:129: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:129 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:129"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:129: diff -b -B \$abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dc.base stderr"
-echo EXPRTest.at:129 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr" "EXPRTest.at:129"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_95
#AT_START_96
-# 96. EXPRTest.at:129: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b (pass)
-at_setup_line='EXPRTest.at:129'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass)"
-$at_quiet $as_echo_n " 96: $at_desc"
+at_fn_group_banner 96 'EXPRTest.at:129' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "96. EXPRTest.at:129: testing ..."
+ $as_echo "96. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13049,111 +10144,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:129: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:129 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:129"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:129: mv stdout \$abs_srcdir/expr-testsuite/test.dc.base.tmp"
-echo EXPRTest.at:129 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp" "EXPRTest.at:129"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dc.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:129"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:129: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:129 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:129"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:129: diff -b -B \$abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dc.base stderr"
-echo EXPRTest.at:129 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr" "EXPRTest.at:129"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_96
#AT_START_97
-# 97. EXPRTest.at:130: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b (pass)
-at_setup_line='EXPRTest.at:130'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass)"
-$at_quiet $as_echo_n " 97: $at_desc"
+at_fn_group_banner 97 'EXPRTest.at:130' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "97. EXPRTest.at:130: testing ..."
+ $as_echo "97. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13165,111 +10228,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:130: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"
-echo EXPRTest.at:130 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true" "EXPRTest.at:130"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:130: mv stdout \$abs_srcdir/expr-testsuite/test.dd.base.tmp"
-echo EXPRTest.at:130 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp" "EXPRTest.at:130"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dd.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:130"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:130: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"
-echo EXPRTest.at:130 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true" "EXPRTest.at:130"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:130: diff -b -B \$abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dd.base stderr"
-echo EXPRTest.at:130 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr" "EXPRTest.at:130"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_97
#AT_START_98
-# 98. EXPRTest.at:130: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b (pass)
-at_setup_line='EXPRTest.at:130'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass)"
-$at_quiet $as_echo_n " 98: $at_desc"
+at_fn_group_banner 98 'EXPRTest.at:130' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "98. EXPRTest.at:130: testing ..."
+ $as_echo "98. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13281,111 +10312,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:130: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"
-echo EXPRTest.at:130 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true" "EXPRTest.at:130"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:130: mv stdout \$abs_srcdir/expr-testsuite/test.dd.base.tmp"
-echo EXPRTest.at:130 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp" "EXPRTest.at:130"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dd.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:130"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:130: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"
-echo EXPRTest.at:130 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true" "EXPRTest.at:130"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:130: diff -b -B \$abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dd.base stderr"
-echo EXPRTest.at:130 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr" "EXPRTest.at:130"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_98
#AT_START_99
-# 99. EXPRTest.at:131: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:131'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass)"
-$at_quiet $as_echo_n " 99: $at_desc"
+at_fn_group_banner 99 'EXPRTest.at:131' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "99. EXPRTest.at:131: testing ..."
+ $as_echo "99. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13397,111 +10396,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:131: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:131 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:131"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:131: mv stdout \$abs_srcdir/expr-testsuite/test.de.base.tmp"
-echo EXPRTest.at:131 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp" "EXPRTest.at:131"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.de.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:131"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:131: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:131 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:131"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:131: diff -b -B \$abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.de.base stderr"
-echo EXPRTest.at:131 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr" "EXPRTest.at:131"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_99
#AT_START_100
-# 100. EXPRTest.at:131: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:131'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass)"
-$at_quiet $as_echo_n "100: $at_desc"
+at_fn_group_banner 100 'EXPRTest.at:131' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "100. EXPRTest.at:131: testing ..."
+ $as_echo "100. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13513,111 +10480,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:131: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:131 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:131"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:131: mv stdout \$abs_srcdir/expr-testsuite/test.de.base.tmp"
-echo EXPRTest.at:131 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp" "EXPRTest.at:131"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.de.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:131"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:131: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:131 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:131"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:131: diff -b -B \$abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.de.base stderr"
-echo EXPRTest.at:131 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr" "EXPRTest.at:131"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_100
#AT_START_101
-# 101. EXPRTest.at:132: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:132'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass)"
-$at_quiet $as_echo_n "101: $at_desc"
+at_fn_group_banner 101 'EXPRTest.at:132' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "101. EXPRTest.at:132: testing ..."
+ $as_echo "101. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13629,111 +10564,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:132: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:132 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:132"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:132: mv stdout \$abs_srcdir/expr-testsuite/test.df.base.tmp"
-echo EXPRTest.at:132 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp" "EXPRTest.at:132"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.df.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:132"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:132: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:132 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:132"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:132: diff -b -B \$abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.df.base stderr"
-echo EXPRTest.at:132 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr" "EXPRTest.at:132"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_101
#AT_START_102
-# 102. EXPRTest.at:132: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b (pass)
-at_setup_line='EXPRTest.at:132'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass)"
-$at_quiet $as_echo_n "102: $at_desc"
+at_fn_group_banner 102 'EXPRTest.at:132' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "102. EXPRTest.at:132: testing ..."
+ $as_echo "102. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13745,111 +10648,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:132: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:132 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:132"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:132: mv stdout \$abs_srcdir/expr-testsuite/test.df.base.tmp"
-echo EXPRTest.at:132 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp" "EXPRTest.at:132"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.df.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:132"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:132: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"
-echo EXPRTest.at:132 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:132"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:132: diff -b -B \$abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.df.base stderr"
-echo EXPRTest.at:132 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr" "EXPRTest.at:132"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_102
#AT_START_103
-# 103. EXPRTest.at:133: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b (pass)
-at_setup_line='EXPRTest.at:133'
-at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass)"
-$at_quiet $as_echo_n "103: $at_desc"
+at_fn_group_banner 103 'EXPRTest.at:133' \
+ "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "103. EXPRTest.at:133: testing ..."
+ $as_echo "103. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13861,111 +10732,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:133: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:133 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:133"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:133: mv stdout \$abs_srcdir/expr-testsuite/test.dg.base.tmp"
-echo EXPRTest.at:133 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp" "EXPRTest.at:133"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dg.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:133"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:133: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:133 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:133"
+( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:133: diff -b -B \$abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dg.base stderr"
-echo EXPRTest.at:133 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr" "EXPRTest.at:133"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_103
#AT_START_104
-# 104. EXPRTest.at:133: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b (pass)
-at_setup_line='EXPRTest.at:133'
-at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass)"
-$at_quiet $as_echo_n "104: $at_desc"
+at_fn_group_banner 104 'EXPRTest.at:133' \
+ "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "104. EXPRTest.at:133: testing ..."
+ $as_echo "104. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13977,111 +10816,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:133: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:133 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:133"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:133: mv stdout \$abs_srcdir/expr-testsuite/test.dg.base.tmp"
-echo EXPRTest.at:133 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp" "EXPRTest.at:133"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dg.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:133"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:133: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"
-echo EXPRTest.at:133 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:133"
+( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:133: diff -b -B \$abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dg.base stderr"
-echo EXPRTest.at:133 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr" "EXPRTest.at:133"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_104
#AT_START_105
-# 105. EXPRTest.at:135: expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i (pass)
-at_setup_line='EXPRTest.at:135'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i (pass)"
-$at_quiet $as_echo_n "105: $at_desc"
+at_fn_group_banner 105 'EXPRTest.at:135' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "105. EXPRTest.at:135: testing ..."
+ $as_echo "105. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14093,111 +10900,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:135: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"
-echo EXPRTest.at:135 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true" "EXPRTest.at:135"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:135: mv stdout \$abs_srcdir/expr-testsuite/data.61a.base.tmp"
-echo EXPRTest.at:135 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp" "EXPRTest.at:135"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61a.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:135"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:135: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"
-echo EXPRTest.at:135 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true" "EXPRTest.at:135"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:135: diff -b -B \$abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61a.base stderr"
-echo EXPRTest.at:135 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr" "EXPRTest.at:135"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_105
#AT_START_106
-# 106. EXPRTest.at:135: expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i (pass)
-at_setup_line='EXPRTest.at:135'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i (pass)"
-$at_quiet $as_echo_n "106: $at_desc"
+at_fn_group_banner 106 'EXPRTest.at:135' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "106. EXPRTest.at:135: testing ..."
+ $as_echo "106. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14209,111 +10984,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:135: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"
-echo EXPRTest.at:135 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true" "EXPRTest.at:135"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:135: mv stdout \$abs_srcdir/expr-testsuite/data.61a.base.tmp"
-echo EXPRTest.at:135 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp" "EXPRTest.at:135"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61a.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:135"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:135: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"
-echo EXPRTest.at:135 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true" "EXPRTest.at:135"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:135: diff -b -B \$abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61a.base stderr"
-echo EXPRTest.at:135 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr" "EXPRTest.at:135"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_106
#AT_START_107
-# 107. EXPRTest.at:136: expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] (pass)
-at_setup_line='EXPRTest.at:136'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] (pass)"
-$at_quiet $as_echo_n "107: $at_desc"
+at_fn_group_banner 107 'EXPRTest.at:136' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "107. EXPRTest.at:136: testing ..."
+ $as_echo "107. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14325,111 +11068,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:136: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true"
-echo EXPRTest.at:136 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true" "EXPRTest.at:136"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:136: mv stdout \$abs_srcdir/expr-testsuite/data.61b.base.tmp"
-echo EXPRTest.at:136 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp" "EXPRTest.at:136"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61b.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:136"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:136: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true"
-echo EXPRTest.at:136 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true" "EXPRTest.at:136"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:136: diff -b -B \$abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61b.base stderr"
-echo EXPRTest.at:136 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr" "EXPRTest.at:136"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_107
#AT_START_108
-# 108. EXPRTest.at:136: expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] (pass)
-at_setup_line='EXPRTest.at:136'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] (pass)"
-$at_quiet $as_echo_n "108: $at_desc"
+at_fn_group_banner 108 'EXPRTest.at:136' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "108. EXPRTest.at:136: testing ..."
+ $as_echo "108. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14441,111 +11152,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:136: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true"
-echo EXPRTest.at:136 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true" "EXPRTest.at:136"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:136: mv stdout \$abs_srcdir/expr-testsuite/data.61b.base.tmp"
-echo EXPRTest.at:136 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp" "EXPRTest.at:136"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61b.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:136"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:136: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true"
-echo EXPRTest.at:136 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -f \"dummy\" || true" "EXPRTest.at:136"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[0:2][0:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:136: diff -b -B \$abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61b.base stderr"
-echo EXPRTest.at:136 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr" "EXPRTest.at:136"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_108
#AT_START_109
-# 109. EXPRTest.at:137: expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] (pass)
-at_setup_line='EXPRTest.at:137'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] (pass)"
-$at_quiet $as_echo_n "109: $at_desc"
+at_fn_group_banner 109 'EXPRTest.at:137' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "109. EXPRTest.at:137: testing ..."
+ $as_echo "109. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14557,111 +11236,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:137: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true"
-echo EXPRTest.at:137 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true" "EXPRTest.at:137"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:137: mv stdout \$abs_srcdir/expr-testsuite/data.61c.base.tmp"
-echo EXPRTest.at:137 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp" "EXPRTest.at:137"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61c.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:137"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:137: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true"
-echo EXPRTest.at:137 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true" "EXPRTest.at:137"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:137: diff -b -B \$abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61c.base stderr"
-echo EXPRTest.at:137 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr" "EXPRTest.at:137"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_109
#AT_START_110
-# 110. EXPRTest.at:137: expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] (pass)
-at_setup_line='EXPRTest.at:137'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] (pass)"
-$at_quiet $as_echo_n "110: $at_desc"
+at_fn_group_banner 110 'EXPRTest.at:137' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "110. EXPRTest.at:137: testing ..."
+ $as_echo "110. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14673,111 +11320,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:137: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true"
-echo EXPRTest.at:137 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true" "EXPRTest.at:137"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:137: mv stdout \$abs_srcdir/expr-testsuite/data.61c.base.tmp"
-echo EXPRTest.at:137 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp" "EXPRTest.at:137"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61c.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:137"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:137: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true"
-echo EXPRTest.at:137 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -f \"dummy\" || true" "EXPRTest.at:137"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][0:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:137: diff -b -B \$abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61c.base stderr"
-echo EXPRTest.at:137 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr" "EXPRTest.at:137"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_110
#AT_START_111
-# 111. EXPRTest.at:138: expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] (pass)
-at_setup_line='EXPRTest.at:138'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] (pass)"
-$at_quiet $as_echo_n "111: $at_desc"
+at_fn_group_banner 111 'EXPRTest.at:138' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "111. EXPRTest.at:138: testing ..."
+ $as_echo "111. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14789,111 +11404,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:138: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true"
-echo EXPRTest.at:138 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true" "EXPRTest.at:138"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:138: mv stdout \$abs_srcdir/expr-testsuite/data.61d.base.tmp"
-echo EXPRTest.at:138 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp" "EXPRTest.at:138"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61d.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:138"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:138: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true"
-echo EXPRTest.at:138 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true" "EXPRTest.at:138"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:138: diff -b -B \$abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61d.base stderr"
-echo EXPRTest.at:138 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr" "EXPRTest.at:138"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_111
#AT_START_112
-# 112. EXPRTest.at:138: expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] (pass)
-at_setup_line='EXPRTest.at:138'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] (pass)"
-$at_quiet $as_echo_n "112: $at_desc"
+at_fn_group_banner 112 'EXPRTest.at:138' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "112. EXPRTest.at:138: testing ..."
+ $as_echo "112. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14905,111 +11488,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:138: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true"
-echo EXPRTest.at:138 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true" "EXPRTest.at:138"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:138: mv stdout \$abs_srcdir/expr-testsuite/data.61d.base.tmp"
-echo EXPRTest.at:138 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp" "EXPRTest.at:138"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61d.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:138"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:138: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true"
-echo EXPRTest.at:138 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -f \"dummy\" || true" "EXPRTest.at:138"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i[1:2][1:2] -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:138: diff -b -B \$abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61d.base stderr"
-echo EXPRTest.at:138 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr" "EXPRTest.at:138"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_112
#AT_START_113
-# 113. EXPRTest.at:139: expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST (pass)
-at_setup_line='EXPRTest.at:139'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass)"
-$at_quiet $as_echo_n "113: $at_desc"
+at_fn_group_banner 113 'EXPRTest.at:139' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "113. EXPRTest.at:139: testing ..."
+ $as_echo "113. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15021,111 +11572,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:139: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"
-echo EXPRTest.at:139 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true" "EXPRTest.at:139"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:139: mv stdout \$abs_srcdir/expr-testsuite/data.z1.base.tmp"
-echo EXPRTest.at:139 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp" "EXPRTest.at:139"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.z1.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:139"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:139: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"
-echo EXPRTest.at:139 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true" "EXPRTest.at:139"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:139: diff -b -B \$abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.z1.base stderr"
-echo EXPRTest.at:139 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr" "EXPRTest.at:139"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_113
#AT_START_114
-# 114. EXPRTest.at:139: expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST (pass)
-at_setup_line='EXPRTest.at:139'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass)"
-$at_quiet $as_echo_n "114: $at_desc"
+at_fn_group_banner 114 'EXPRTest.at:139' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "114. EXPRTest.at:139: testing ..."
+ $as_echo "114. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15137,111 +11656,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:139: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"
-echo EXPRTest.at:139 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true" "EXPRTest.at:139"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:139: mv stdout \$abs_srcdir/expr-testsuite/data.z1.base.tmp"
-echo EXPRTest.at:139 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp" "EXPRTest.at:139"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.z1.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:139"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:139: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"
-echo EXPRTest.at:139 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true" "EXPRTest.at:139"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:139: diff -b -B \$abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.z1.base stderr"
-echo EXPRTest.at:139 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr" "EXPRTest.at:139"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_114
#AT_START_115
-# 115. EXPRTest.at:141: expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" (pass)
-at_setup_line='EXPRTest.at:141'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)"
-$at_quiet $as_echo_n "115: $at_desc"
+at_fn_group_banner 115 'EXPRTest.at:141' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "115. EXPRTest.at:141: testing ..."
+ $as_echo "115. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15253,111 +11740,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:141: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:141 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true" "EXPRTest.at:141"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:141: mv stdout \$abs_srcdir/expr-testsuite/test.fa.base.tmp"
-echo EXPRTest.at:141 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp" "EXPRTest.at:141"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.fa.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:141"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:141: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:141 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true" "EXPRTest.at:141"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:141: diff -b -B \$abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.fa.base stderr"
-echo EXPRTest.at:141 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr" "EXPRTest.at:141"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_115
#AT_START_116
-# 116. EXPRTest.at:141: expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" (pass)
-at_setup_line='EXPRTest.at:141'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)"
-$at_quiet $as_echo_n "116: $at_desc"
+at_fn_group_banner 116 'EXPRTest.at:141' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "116. EXPRTest.at:141: testing ..."
+ $as_echo "116. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15369,111 +11824,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:141: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:141 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true" "EXPRTest.at:141"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:141: mv stdout \$abs_srcdir/expr-testsuite/test.fa.base.tmp"
-echo EXPRTest.at:141 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp" "EXPRTest.at:141"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.fa.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:141"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:141: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:141 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true" "EXPRTest.at:141"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:141: diff -b -B \$abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.fa.base stderr"
-echo EXPRTest.at:141 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr" "EXPRTest.at:141"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_116
#AT_START_117
-# 117. EXPRTest.at:142: expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" (pass)
-at_setup_line='EXPRTest.at:142'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass)"
-$at_quiet $as_echo_n "117: $at_desc"
+at_fn_group_banner 117 'EXPRTest.at:142' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "117. EXPRTest.at:142: testing ..."
+ $as_echo "117. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15485,111 +11908,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:142: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"
-echo EXPRTest.at:142 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true" "EXPRTest.at:142"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:142: mv stdout \$abs_srcdir/expr-testsuite/test.fb.base.tmp"
-echo EXPRTest.at:142 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp" "EXPRTest.at:142"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.fb.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:142"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:142: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"
-echo EXPRTest.at:142 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true" "EXPRTest.at:142"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:142: diff -b -B \$abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.fb.base stderr"
-echo EXPRTest.at:142 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr" "EXPRTest.at:142"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_117
#AT_START_118
-# 118. EXPRTest.at:142: expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" (pass)
-at_setup_line='EXPRTest.at:142'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass)"
-$at_quiet $as_echo_n "118: $at_desc"
+at_fn_group_banner 118 'EXPRTest.at:142' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "118. EXPRTest.at:142: testing ..."
+ $as_echo "118. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15601,111 +11992,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:142: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"
-echo EXPRTest.at:142 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true" "EXPRTest.at:142"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:142: mv stdout \$abs_srcdir/expr-testsuite/test.fb.base.tmp"
-echo EXPRTest.at:142 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp" "EXPRTest.at:142"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.fb.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:142"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:142: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"
-echo EXPRTest.at:142 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true" "EXPRTest.at:142"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:142: diff -b -B \$abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.fb.base stderr"
-echo EXPRTest.at:142 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr" "EXPRTest.at:142"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_118
#AT_START_119
-# 119. EXPRTest.at:146: expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" (pass)
-at_setup_line='EXPRTest.at:146'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "119: $at_desc"
+at_fn_group_banner 119 'EXPRTest.at:146' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "119. EXPRTest.at:146: testing ..."
+ $as_echo "119. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15717,111 +12076,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:146: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:146 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:146"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:146: mv stdout \$abs_srcdir/expr-testsuite/data.21.base.tmp"
-echo EXPRTest.at:146 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp" "EXPRTest.at:146"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.21.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:146"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:146: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:146 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:146"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:146: diff -b -B \$abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.21.base stderr"
-echo EXPRTest.at:146 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr" "EXPRTest.at:146"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_119
#AT_START_120
-# 120. EXPRTest.at:146: expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" (pass)
-at_setup_line='EXPRTest.at:146'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "120: $at_desc"
+at_fn_group_banner 120 'EXPRTest.at:146' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "120. EXPRTest.at:146: testing ..."
+ $as_echo "120. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15833,111 +12160,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:146: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:146 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:146"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:146: mv stdout \$abs_srcdir/expr-testsuite/data.21.base.tmp"
-echo EXPRTest.at:146 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp" "EXPRTest.at:146"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.21.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:146"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:146: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:146 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:146"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:146: diff -b -B \$abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.21.base stderr"
-echo EXPRTest.at:146 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr" "EXPRTest.at:146"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_120
#AT_START_121
-# 121. EXPRTest.at:147: expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" (pass)
-at_setup_line='EXPRTest.at:147'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "121: $at_desc"
+at_fn_group_banner 121 'EXPRTest.at:147' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "121. EXPRTest.at:147: testing ..."
+ $as_echo "121. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15949,111 +12244,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:147: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:147 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:147"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:147: mv stdout \$abs_srcdir/expr-testsuite/data.22.base.tmp"
-echo EXPRTest.at:147 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp" "EXPRTest.at:147"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.22.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:147"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:147: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:147 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:147"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:147: diff -b -B \$abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.22.base stderr"
-echo EXPRTest.at:147 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr" "EXPRTest.at:147"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_121
#AT_START_122
-# 122. EXPRTest.at:147: expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" (pass)
-at_setup_line='EXPRTest.at:147'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "122: $at_desc"
+at_fn_group_banner 122 'EXPRTest.at:147' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "122. EXPRTest.at:147: testing ..."
+ $as_echo "122. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16065,111 +12328,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:147: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:147 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:147"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:147: mv stdout \$abs_srcdir/expr-testsuite/data.22.base.tmp"
-echo EXPRTest.at:147 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp" "EXPRTest.at:147"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.22.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:147"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:147: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:147 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:147"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:147: diff -b -B \$abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.22.base stderr"
-echo EXPRTest.at:147 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr" "EXPRTest.at:147"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_122
#AT_START_123
-# 123. EXPRTest.at:148: expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" (pass)
-at_setup_line='EXPRTest.at:148'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "123: $at_desc"
+at_fn_group_banner 123 'EXPRTest.at:148' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "123. EXPRTest.at:148: testing ..."
+ $as_echo "123. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16181,111 +12412,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:148: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:148 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:148"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:148: mv stdout \$abs_srcdir/expr-testsuite/data.23.base.tmp"
-echo EXPRTest.at:148 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp" "EXPRTest.at:148"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.23.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:148"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:148: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:148 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:148"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:148: diff -b -B \$abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.23.base stderr"
-echo EXPRTest.at:148 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr" "EXPRTest.at:148"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_123
#AT_START_124
-# 124. EXPRTest.at:148: expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" (pass)
-at_setup_line='EXPRTest.at:148'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "124: $at_desc"
+at_fn_group_banner 124 'EXPRTest.at:148' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "124. EXPRTest.at:148: testing ..."
+ $as_echo "124. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16297,111 +12496,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:148: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:148 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:148"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:148: mv stdout \$abs_srcdir/expr-testsuite/data.23.base.tmp"
-echo EXPRTest.at:148 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp" "EXPRTest.at:148"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.23.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:148"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:148: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:148 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:148"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:148: diff -b -B \$abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.23.base stderr"
-echo EXPRTest.at:148 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr" "EXPRTest.at:148"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_124
#AT_START_125
-# 125. EXPRTest.at:149: expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" (pass)
-at_setup_line='EXPRTest.at:149'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "125: $at_desc"
+at_fn_group_banner 125 'EXPRTest.at:149' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "125. EXPRTest.at:149: testing ..."
+ $as_echo "125. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16413,111 +12580,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:149: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:149 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:149"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:149: mv stdout \$abs_srcdir/expr-testsuite/data.24.base.tmp"
-echo EXPRTest.at:149 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp" "EXPRTest.at:149"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.24.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:149"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:149: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:149 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:149"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:149: diff -b -B \$abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.24.base stderr"
-echo EXPRTest.at:149 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr" "EXPRTest.at:149"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_125
#AT_START_126
-# 126. EXPRTest.at:149: expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" (pass)
-at_setup_line='EXPRTest.at:149'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "126: $at_desc"
+at_fn_group_banner 126 'EXPRTest.at:149' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "126. EXPRTest.at:149: testing ..."
+ $as_echo "126. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16529,111 +12664,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:149: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:149 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:149"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:149: mv stdout \$abs_srcdir/expr-testsuite/data.24.base.tmp"
-echo EXPRTest.at:149 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp" "EXPRTest.at:149"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.24.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:149"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:149: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:149 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:149"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:149: diff -b -B \$abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.24.base stderr"
-echo EXPRTest.at:149 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr" "EXPRTest.at:149"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_126
#AT_START_127
-# 127. EXPRTest.at:153: expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" (pass)
-at_setup_line='EXPRTest.at:153'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "127: $at_desc"
+at_fn_group_banner 127 'EXPRTest.at:153' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "127. EXPRTest.at:153: testing ..."
+ $as_echo "127. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16645,111 +12748,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:153: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:153 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:153"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:153: mv stdout \$abs_srcdir/expr-testsuite/data.25.base.tmp"
-echo EXPRTest.at:153 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp" "EXPRTest.at:153"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.25.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:153"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:153: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:153 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:153"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:153: diff -b -B \$abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.25.base stderr"
-echo EXPRTest.at:153 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr" "EXPRTest.at:153"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_127
#AT_START_128
-# 128. EXPRTest.at:153: expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" (pass)
-at_setup_line='EXPRTest.at:153'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "128: $at_desc"
+at_fn_group_banner 128 'EXPRTest.at:153' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "128. EXPRTest.at:153: testing ..."
+ $as_echo "128. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16761,111 +12832,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:153: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:153 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:153"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:153: mv stdout \$abs_srcdir/expr-testsuite/data.25.base.tmp"
-echo EXPRTest.at:153 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp" "EXPRTest.at:153"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.25.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:153"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:153: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:153 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:153"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:153: diff -b -B \$abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.25.base stderr"
-echo EXPRTest.at:153 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr" "EXPRTest.at:153"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_128
#AT_START_129
-# 129. EXPRTest.at:154: expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" (pass)
-at_setup_line='EXPRTest.at:154'
-at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "129: $at_desc"
+at_fn_group_banner 129 'EXPRTest.at:154' \
+ "expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "129. EXPRTest.at:154: testing ..."
+ $as_echo "129. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16877,111 +12916,79 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:154: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:154 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:154"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:154: mv stdout \$abs_srcdir/expr-testsuite/data.26.base.tmp"
-echo EXPRTest.at:154 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp" "EXPRTest.at:154"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.26.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:154"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:154: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:154 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:154"
+( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:154: diff -b -B \$abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.26.base stderr"
-echo EXPRTest.at:154 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr" "EXPRTest.at:154"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_129
#AT_START_130
-# 130. EXPRTest.at:154: expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" (pass)
-at_setup_line='EXPRTest.at:154'
-at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass)"
-$at_quiet $as_echo_n "130: $at_desc"
+at_fn_group_banner 130 'EXPRTest.at:154' \
+ "expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "130. EXPRTest.at:154: testing ..."
+ $as_echo "130. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16993,98 +13000,69 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- if test -n "$baselines" -a x$baselines = xyes; then
+ if test -n "$baselines" -a x$baselines = xyes; then :
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:154: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:154 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:154"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:154: mv stdout \$abs_srcdir/expr-testsuite/data.26.base.tmp"
-echo EXPRTest.at:154 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp"; then
- ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
-at_func_diff_devnull "$at_stdout" || at_failed=:
-at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-
-$at_failed && at_func_log_failure
+at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp" "EXPRTest.at:154"
+( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.26.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:154"
+$at_failed && at_fn_log_failure
$at_traceon; }
else
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:154: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"
-echo EXPRTest.at:154 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"; then
- ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:154"
+( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/EXPRTest.at:154: diff -b -B \$abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.26.base stderr"
-echo EXPRTest.at:154 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr" "EXPRTest.at:154"
+( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.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_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+$at_failed && at_fn_log_failure
$at_traceon; }
fi
-
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_130
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 14725b8..d7a62ea 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in 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.
@@ -19,6 +18,51 @@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -42,8 +86,9 @@ check_PROGRAMS = das-test$(EXEEXT) dds-test$(EXEEXT) \
expr-test$(EXEEXT) $(am__EXEEXT_1)
@DAP4_DEFINED_TRUE at am__append_3 = dmr-test
subdir = tests
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/atlocal.in $(testheaders_HEADERS)
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(srcdir)/atlocal.in $(top_srcdir)/conf/depcomp \
+ $(testheaders_HEADERS) README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
$(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -118,8 +163,18 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(testheadersdir)"
LIBRARIES = $(lib_LIBRARIES)
+AM_V_AR = $(am__v_AR_ at AM_V@)
+am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+am__v_AR_0 = @echo " AR " $@;
+am__v_AR_1 =
libtest_types_a_AR = $(AR) $(ARFLAGS)
libtest_types_a_LIBADD =
am__objects_1 = libtest_types_a-TestByte.$(OBJEXT) \
@@ -154,6 +209,10 @@ am_das_test_OBJECTS = das-test.$(OBJEXT)
das_test_OBJECTS = $(am_das_test_OBJECTS)
das_test_DEPENDENCIES = libtest-types.a ../libdapserver.la \
../libdap.la
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
am_dds_test_OBJECTS = dds-test.$(OBJEXT)
dds_test_OBJECTS = $(am_dds_test_OBJECTS)
dds_test_DEPENDENCIES = libtest-types.a ../libdapserver.la \
@@ -169,34 +228,86 @@ am_expr_test_OBJECTS = expr-test.$(OBJEXT) ResponseBuilder.$(OBJEXT)
expr_test_OBJECTS = $(am_expr_test_OBJECTS)
expr_test_DEPENDENCIES = libtest-types.a ../libdapserver.la \
../libdapclient.la ../libdap.la
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libtest_types_a_SOURCES) $(das_test_SOURCES) \
$(dds_test_SOURCES) $(dmr_test_SOURCES) $(expr_test_SOURCES)
DIST_SOURCES = $(libtest_types_a_SOURCES) $(das_test_SOURCES) \
$(dds_test_SOURCES) $(am__dmr_test_SOURCES_DIST) \
$(expr_test_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
HEADERS = $(testheaders_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -205,6 +316,7 @@ ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
@@ -244,6 +356,7 @@ DAPLIB_REVISION = @DAPLIB_REVISION@
DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DVR = @DVR@
@@ -559,6 +672,7 @@ LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
@@ -592,6 +706,7 @@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
@@ -696,6 +811,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -738,7 +854,6 @@ libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -864,7 +979,6 @@ atlocal: $(top_builddir)/config.status $(srcdir)/atlocal.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLIBRARIES: $(lib_LIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -872,6 +986,8 @@ install-libLIBRARIES: $(lib_LIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \
$(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
@$(POST_INSTALL)
@@ -888,16 +1004,15 @@ uninstall-libLIBRARIES:
@$(NORMAL_UNINSTALL)
@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \
- cd "$(DESTDIR)$(libdir)" && rm -f $$files
+ dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir)
clean-libLIBRARIES:
-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-libtest-types.a: $(libtest_types_a_OBJECTS) $(libtest_types_a_DEPENDENCIES)
- -rm -f libtest-types.a
- $(libtest_types_a_AR) libtest-types.a $(libtest_types_a_OBJECTS) $(libtest_types_a_LIBADD)
- $(RANLIB) libtest-types.a
+
+libtest-types.a: $(libtest_types_a_OBJECTS) $(libtest_types_a_DEPENDENCIES) $(EXTRA_libtest_types_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libtest-types.a
+ $(AM_V_AR)$(libtest_types_a_AR) libtest-types.a $(libtest_types_a_OBJECTS) $(libtest_types_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libtest-types.a
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -907,18 +1022,22 @@ clean-checkPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-das-test$(EXEEXT): $(das_test_OBJECTS) $(das_test_DEPENDENCIES)
+
+das-test$(EXEEXT): $(das_test_OBJECTS) $(das_test_DEPENDENCIES) $(EXTRA_das_test_DEPENDENCIES)
@rm -f das-test$(EXEEXT)
- $(CXXLINK) $(das_test_OBJECTS) $(das_test_LDADD) $(LIBS)
-dds-test$(EXEEXT): $(dds_test_OBJECTS) $(dds_test_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(das_test_OBJECTS) $(das_test_LDADD) $(LIBS)
+
+dds-test$(EXEEXT): $(dds_test_OBJECTS) $(dds_test_DEPENDENCIES) $(EXTRA_dds_test_DEPENDENCIES)
@rm -f dds-test$(EXEEXT)
- $(CXXLINK) $(dds_test_OBJECTS) $(dds_test_LDADD) $(LIBS)
-dmr-test$(EXEEXT): $(dmr_test_OBJECTS) $(dmr_test_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(dds_test_OBJECTS) $(dds_test_LDADD) $(LIBS)
+
+dmr-test$(EXEEXT): $(dmr_test_OBJECTS) $(dmr_test_DEPENDENCIES) $(EXTRA_dmr_test_DEPENDENCIES)
@rm -f dmr-test$(EXEEXT)
- $(CXXLINK) $(dmr_test_OBJECTS) $(dmr_test_LDADD) $(LIBS)
-expr-test$(EXEEXT): $(expr_test_OBJECTS) $(expr_test_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(dmr_test_OBJECTS) $(dmr_test_LDADD) $(LIBS)
+
+expr-test$(EXEEXT): $(expr_test_OBJECTS) $(expr_test_DEPENDENCIES) $(EXTRA_expr_test_DEPENDENCIES)
@rm -f expr-test$(EXEEXT)
- $(CXXLINK) $(expr_test_OBJECTS) $(expr_test_LDADD) $(LIBS)
+ $(AM_V_CXXLD)$(CXXLINK) $(expr_test_OBJECTS) $(expr_test_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -958,361 +1077,361 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtest_types_a-TestUrl.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.lo:
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
libtest_types_a-TestByte.o: TestByte.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestByte.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestByte.Tpo -c -o libtest_types_a-TestByte.o `test -f 'TestByte.cc' || echo '$(srcdir)/'`TestByte.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestByte.Tpo $(DEPDIR)/libtest_types_a-TestByte.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestByte.cc' object='libtest_types_a-TestByte.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestByte.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestByte.Tpo -c -o libtest_types_a-TestByte.o `test -f 'TestByte.cc' || echo '$(srcdir)/'`TestByte.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestByte.Tpo $(DEPDIR)/libtest_types_a-TestByte.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestByte.cc' object='libtest_types_a-TestByte.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestByte.o `test -f 'TestByte.cc' || echo '$(srcdir)/'`TestByte.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestByte.o `test -f 'TestByte.cc' || echo '$(srcdir)/'`TestByte.cc
libtest_types_a-TestByte.obj: TestByte.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestByte.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestByte.Tpo -c -o libtest_types_a-TestByte.obj `if test -f 'TestByte.cc'; then $(CYGPATH_W) 'TestByte.cc'; else $(CYGPATH_W) '$(srcdir)/TestByte.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestByte.Tpo $(DEPDIR)/libtest_types_a-TestByte.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestByte.cc' object='libtest_types_a-TestByte.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestByte.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestByte.Tpo -c -o libtest_types_a-TestByte.obj `if test -f 'TestByte.cc'; then $(CYGPATH_W) 'TestByte.cc'; else $(CYGPATH_W) '$(srcdir)/TestByte.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestByte.Tpo $(DEPDIR)/libtest_types_a-TestByte.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestByte.cc' object='libtest_types_a-TestByte.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestByte.obj `if test -f 'TestByte.cc'; then $(CYGPATH_W) 'TestByte.cc'; else $(CYGPATH_W) '$(srcdir)/TestByte.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestByte.obj `if test -f 'TestByte.cc'; then $(CYGPATH_W) 'TestByte.cc'; else $(CYGPATH_W) '$(srcdir)/TestByte.cc'; fi`
libtest_types_a-TestInt32.o: TestInt32.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt32.Tpo -c -o libtest_types_a-TestInt32.o `test -f 'TestInt32.cc' || echo '$(srcdir)/'`TestInt32.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestInt32.Tpo $(DEPDIR)/libtest_types_a-TestInt32.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestInt32.cc' object='libtest_types_a-TestInt32.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt32.Tpo -c -o libtest_types_a-TestInt32.o `test -f 'TestInt32.cc' || echo '$(srcdir)/'`TestInt32.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt32.Tpo $(DEPDIR)/libtest_types_a-TestInt32.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestInt32.cc' object='libtest_types_a-TestInt32.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt32.o `test -f 'TestInt32.cc' || echo '$(srcdir)/'`TestInt32.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt32.o `test -f 'TestInt32.cc' || echo '$(srcdir)/'`TestInt32.cc
libtest_types_a-TestInt32.obj: TestInt32.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt32.Tpo -c -o libtest_types_a-TestInt32.obj `if test -f 'TestInt32.cc'; then $(CYGPATH_W) 'TestInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt32.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestInt32.Tpo $(DEPDIR)/libtest_types_a-TestInt32.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestInt32.cc' object='libtest_types_a-TestInt32.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt32.Tpo -c -o libtest_types_a-TestInt32.obj `if test -f 'TestInt32.cc'; then $(CYGPATH_W) 'TestInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt32.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt32.Tpo $(DEPDIR)/libtest_types_a-TestInt32.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestInt32.cc' object='libtest_types_a-TestInt32.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt32.obj `if test -f 'TestInt32.cc'; then $(CYGPATH_W) 'TestInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt32.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt32.obj `if test -f 'TestInt32.cc'; then $(CYGPATH_W) 'TestInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt32.cc'; fi`
libtest_types_a-TestFloat64.o: TestFloat64.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat64.Tpo -c -o libtest_types_a-TestFloat64.o `test -f 'TestFloat64.cc' || echo '$(srcdir)/'`TestFloat64.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestFloat64.Tpo $(DEPDIR)/libtest_types_a-TestFloat64.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestFloat64.cc' object='libtest_types_a-TestFloat64.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat64.Tpo -c -o libtest_types_a-TestFloat64.o `test -f 'TestFloat64.cc' || echo '$(srcdir)/'`TestFloat64.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFloat64.Tpo $(DEPDIR)/libtest_types_a-TestFloat64.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestFloat64.cc' object='libtest_types_a-TestFloat64.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat64.o `test -f 'TestFloat64.cc' || echo '$(srcdir)/'`TestFloat64.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat64.o `test -f 'TestFloat64.cc' || echo '$(srcdir)/'`TestFloat64.cc
libtest_types_a-TestFloat64.obj: TestFloat64.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat64.Tpo -c -o libtest_types_a-TestFloat64.obj `if test -f 'TestFloat64.cc'; then $(CYGPATH_W) 'TestFloat64.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat64.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestFloat64.Tpo $(DEPDIR)/libtest_types_a-TestFloat64.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestFloat64.cc' object='libtest_types_a-TestFloat64.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat64.Tpo -c -o libtest_types_a-TestFloat64.obj `if test -f 'TestFloat64.cc'; then $(CYGPATH_W) 'TestFloat64.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat64.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFloat64.Tpo $(DEPDIR)/libtest_types_a-TestFloat64.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestFloat64.cc' object='libtest_types_a-TestFloat64.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat64.obj `if test -f 'TestFloat64.cc'; then $(CYGPATH_W) 'TestFloat64.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat64.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat64.obj `if test -f 'TestFloat64.cc'; then $(CYGPATH_W) 'TestFloat64.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat64.cc'; fi`
libtest_types_a-TestStr.o: TestStr.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStr.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStr.Tpo -c -o libtest_types_a-TestStr.o `test -f 'TestStr.cc' || echo '$(srcdir)/'`TestStr.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestStr.Tpo $(DEPDIR)/libtest_types_a-TestStr.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestStr.cc' object='libtest_types_a-TestStr.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStr.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStr.Tpo -c -o libtest_types_a-TestStr.o `test -f 'TestStr.cc' || echo '$(srcdir)/'`TestStr.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestStr.Tpo $(DEPDIR)/libtest_types_a-TestStr.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestStr.cc' object='libtest_types_a-TestStr.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStr.o `test -f 'TestStr.cc' || echo '$(srcdir)/'`TestStr.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStr.o `test -f 'TestStr.cc' || echo '$(srcdir)/'`TestStr.cc
libtest_types_a-TestStr.obj: TestStr.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStr.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStr.Tpo -c -o libtest_types_a-TestStr.obj `if test -f 'TestStr.cc'; then $(CYGPATH_W) 'TestStr.cc'; else $(CYGPATH_W) '$(srcdir)/TestStr.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestStr.Tpo $(DEPDIR)/libtest_types_a-TestStr.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestStr.cc' object='libtest_types_a-TestStr.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStr.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStr.Tpo -c -o libtest_types_a-TestStr.obj `if test -f 'TestStr.cc'; then $(CYGPATH_W) 'TestStr.cc'; else $(CYGPATH_W) '$(srcdir)/TestStr.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestStr.Tpo $(DEPDIR)/libtest_types_a-TestStr.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestStr.cc' object='libtest_types_a-TestStr.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStr.obj `if test -f 'TestStr.cc'; then $(CYGPATH_W) 'TestStr.cc'; else $(CYGPATH_W) '$(srcdir)/TestStr.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStr.obj `if test -f 'TestStr.cc'; then $(CYGPATH_W) 'TestStr.cc'; else $(CYGPATH_W) '$(srcdir)/TestStr.cc'; fi`
libtest_types_a-TestUrl.o: TestUrl.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUrl.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUrl.Tpo -c -o libtest_types_a-TestUrl.o `test -f 'TestUrl.cc' || echo '$(srcdir)/'`TestUrl.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestUrl.Tpo $(DEPDIR)/libtest_types_a-TestUrl.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestUrl.cc' object='libtest_types_a-TestUrl.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUrl.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUrl.Tpo -c -o libtest_types_a-TestUrl.o `test -f 'TestUrl.cc' || echo '$(srcdir)/'`TestUrl.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUrl.Tpo $(DEPDIR)/libtest_types_a-TestUrl.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestUrl.cc' object='libtest_types_a-TestUrl.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUrl.o `test -f 'TestUrl.cc' || echo '$(srcdir)/'`TestUrl.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUrl.o `test -f 'TestUrl.cc' || echo '$(srcdir)/'`TestUrl.cc
libtest_types_a-TestUrl.obj: TestUrl.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUrl.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUrl.Tpo -c -o libtest_types_a-TestUrl.obj `if test -f 'TestUrl.cc'; then $(CYGPATH_W) 'TestUrl.cc'; else $(CYGPATH_W) '$(srcdir)/TestUrl.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestUrl.Tpo $(DEPDIR)/libtest_types_a-TestUrl.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestUrl.cc' object='libtest_types_a-TestUrl.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUrl.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUrl.Tpo -c -o libtest_types_a-TestUrl.obj `if test -f 'TestUrl.cc'; then $(CYGPATH_W) 'TestUrl.cc'; else $(CYGPATH_W) '$(srcdir)/TestUrl.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUrl.Tpo $(DEPDIR)/libtest_types_a-TestUrl.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestUrl.cc' object='libtest_types_a-TestUrl.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUrl.obj `if test -f 'TestUrl.cc'; then $(CYGPATH_W) 'TestUrl.cc'; else $(CYGPATH_W) '$(srcdir)/TestUrl.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUrl.obj `if test -f 'TestUrl.cc'; then $(CYGPATH_W) 'TestUrl.cc'; else $(CYGPATH_W) '$(srcdir)/TestUrl.cc'; fi`
libtest_types_a-TestArray.o: TestArray.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestArray.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestArray.Tpo -c -o libtest_types_a-TestArray.o `test -f 'TestArray.cc' || echo '$(srcdir)/'`TestArray.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestArray.Tpo $(DEPDIR)/libtest_types_a-TestArray.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestArray.cc' object='libtest_types_a-TestArray.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestArray.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestArray.Tpo -c -o libtest_types_a-TestArray.o `test -f 'TestArray.cc' || echo '$(srcdir)/'`TestArray.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestArray.Tpo $(DEPDIR)/libtest_types_a-TestArray.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestArray.cc' object='libtest_types_a-TestArray.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestArray.o `test -f 'TestArray.cc' || echo '$(srcdir)/'`TestArray.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestArray.o `test -f 'TestArray.cc' || echo '$(srcdir)/'`TestArray.cc
libtest_types_a-TestArray.obj: TestArray.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestArray.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestArray.Tpo -c -o libtest_types_a-TestArray.obj `if test -f 'TestArray.cc'; then $(CYGPATH_W) 'TestArray.cc'; else $(CYGPATH_W) '$(srcdir)/TestArray.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestArray.Tpo $(DEPDIR)/libtest_types_a-TestArray.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestArray.cc' object='libtest_types_a-TestArray.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestArray.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestArray.Tpo -c -o libtest_types_a-TestArray.obj `if test -f 'TestArray.cc'; then $(CYGPATH_W) 'TestArray.cc'; else $(CYGPATH_W) '$(srcdir)/TestArray.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestArray.Tpo $(DEPDIR)/libtest_types_a-TestArray.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestArray.cc' object='libtest_types_a-TestArray.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestArray.obj `if test -f 'TestArray.cc'; then $(CYGPATH_W) 'TestArray.cc'; else $(CYGPATH_W) '$(srcdir)/TestArray.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestArray.obj `if test -f 'TestArray.cc'; then $(CYGPATH_W) 'TestArray.cc'; else $(CYGPATH_W) '$(srcdir)/TestArray.cc'; fi`
libtest_types_a-TestStructure.o: TestStructure.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStructure.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStructure.Tpo -c -o libtest_types_a-TestStructure.o `test -f 'TestStructure.cc' || echo '$(srcdir)/'`TestStructure.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestStructure.Tpo $(DEPDIR)/libtest_types_a-TestStructure.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestStructure.cc' object='libtest_types_a-TestStructure.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStructure.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStructure.Tpo -c -o libtest_types_a-TestStructure.o `test -f 'TestStructure.cc' || echo '$(srcdir)/'`TestStructure.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestStructure.Tpo $(DEPDIR)/libtest_types_a-TestStructure.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestStructure.cc' object='libtest_types_a-TestStructure.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStructure.o `test -f 'TestStructure.cc' || echo '$(srcdir)/'`TestStructure.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStructure.o `test -f 'TestStructure.cc' || echo '$(srcdir)/'`TestStructure.cc
libtest_types_a-TestStructure.obj: TestStructure.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStructure.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStructure.Tpo -c -o libtest_types_a-TestStructure.obj `if test -f 'TestStructure.cc'; then $(CYGPATH_W) 'TestStructure.cc'; else $(CYGPATH_W) '$(srcdir)/TestStructure.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestStructure.Tpo $(DEPDIR)/libtest_types_a-TestStructure.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestStructure.cc' object='libtest_types_a-TestStructure.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestStructure.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestStructure.Tpo -c -o libtest_types_a-TestStructure.obj `if test -f 'TestStructure.cc'; then $(CYGPATH_W) 'TestStructure.cc'; else $(CYGPATH_W) '$(srcdir)/TestStructure.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestStructure.Tpo $(DEPDIR)/libtest_types_a-TestStructure.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestStructure.cc' object='libtest_types_a-TestStructure.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStructure.obj `if test -f 'TestStructure.cc'; then $(CYGPATH_W) 'TestStructure.cc'; else $(CYGPATH_W) '$(srcdir)/TestStructure.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestStructure.obj `if test -f 'TestStructure.cc'; then $(CYGPATH_W) 'TestStructure.cc'; else $(CYGPATH_W) '$(srcdir)/TestStructure.cc'; fi`
libtest_types_a-TestSequence.o: TestSequence.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestSequence.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestSequence.Tpo -c -o libtest_types_a-TestSequence.o `test -f 'TestSequence.cc' || echo '$(srcdir)/'`TestSequence.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestSequence.Tpo $(DEPDIR)/libtest_types_a-TestSequence.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestSequence.cc' object='libtest_types_a-TestSequence.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestSequence.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestSequence.Tpo -c -o libtest_types_a-TestSequence.o `test -f 'TestSequence.cc' || echo '$(srcdir)/'`TestSequence.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestSequence.Tpo $(DEPDIR)/libtest_types_a-TestSequence.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestSequence.cc' object='libtest_types_a-TestSequence.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestSequence.o `test -f 'TestSequence.cc' || echo '$(srcdir)/'`TestSequence.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestSequence.o `test -f 'TestSequence.cc' || echo '$(srcdir)/'`TestSequence.cc
libtest_types_a-TestSequence.obj: TestSequence.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestSequence.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestSequence.Tpo -c -o libtest_types_a-TestSequence.obj `if test -f 'TestSequence.cc'; then $(CYGPATH_W) 'TestSequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestSequence.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestSequence.Tpo $(DEPDIR)/libtest_types_a-TestSequence.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestSequence.cc' object='libtest_types_a-TestSequence.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestSequence.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestSequence.Tpo -c -o libtest_types_a-TestSequence.obj `if test -f 'TestSequence.cc'; then $(CYGPATH_W) 'TestSequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestSequence.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestSequence.Tpo $(DEPDIR)/libtest_types_a-TestSequence.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestSequence.cc' object='libtest_types_a-TestSequence.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestSequence.obj `if test -f 'TestSequence.cc'; then $(CYGPATH_W) 'TestSequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestSequence.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestSequence.obj `if test -f 'TestSequence.cc'; then $(CYGPATH_W) 'TestSequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestSequence.cc'; fi`
libtest_types_a-TestGrid.o: TestGrid.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestGrid.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestGrid.Tpo -c -o libtest_types_a-TestGrid.o `test -f 'TestGrid.cc' || echo '$(srcdir)/'`TestGrid.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestGrid.Tpo $(DEPDIR)/libtest_types_a-TestGrid.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestGrid.cc' object='libtest_types_a-TestGrid.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestGrid.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestGrid.Tpo -c -o libtest_types_a-TestGrid.o `test -f 'TestGrid.cc' || echo '$(srcdir)/'`TestGrid.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestGrid.Tpo $(DEPDIR)/libtest_types_a-TestGrid.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestGrid.cc' object='libtest_types_a-TestGrid.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestGrid.o `test -f 'TestGrid.cc' || echo '$(srcdir)/'`TestGrid.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestGrid.o `test -f 'TestGrid.cc' || echo '$(srcdir)/'`TestGrid.cc
libtest_types_a-TestGrid.obj: TestGrid.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestGrid.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestGrid.Tpo -c -o libtest_types_a-TestGrid.obj `if test -f 'TestGrid.cc'; then $(CYGPATH_W) 'TestGrid.cc'; else $(CYGPATH_W) '$(srcdir)/TestGrid.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestGrid.Tpo $(DEPDIR)/libtest_types_a-TestGrid.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestGrid.cc' object='libtest_types_a-TestGrid.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestGrid.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestGrid.Tpo -c -o libtest_types_a-TestGrid.obj `if test -f 'TestGrid.cc'; then $(CYGPATH_W) 'TestGrid.cc'; else $(CYGPATH_W) '$(srcdir)/TestGrid.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestGrid.Tpo $(DEPDIR)/libtest_types_a-TestGrid.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestGrid.cc' object='libtest_types_a-TestGrid.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestGrid.obj `if test -f 'TestGrid.cc'; then $(CYGPATH_W) 'TestGrid.cc'; else $(CYGPATH_W) '$(srcdir)/TestGrid.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestGrid.obj `if test -f 'TestGrid.cc'; then $(CYGPATH_W) 'TestGrid.cc'; else $(CYGPATH_W) '$(srcdir)/TestGrid.cc'; fi`
libtest_types_a-TestUInt32.o: TestUInt32.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt32.Tpo -c -o libtest_types_a-TestUInt32.o `test -f 'TestUInt32.cc' || echo '$(srcdir)/'`TestUInt32.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestUInt32.Tpo $(DEPDIR)/libtest_types_a-TestUInt32.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestUInt32.cc' object='libtest_types_a-TestUInt32.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt32.Tpo -c -o libtest_types_a-TestUInt32.o `test -f 'TestUInt32.cc' || echo '$(srcdir)/'`TestUInt32.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt32.Tpo $(DEPDIR)/libtest_types_a-TestUInt32.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestUInt32.cc' object='libtest_types_a-TestUInt32.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt32.o `test -f 'TestUInt32.cc' || echo '$(srcdir)/'`TestUInt32.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt32.o `test -f 'TestUInt32.cc' || echo '$(srcdir)/'`TestUInt32.cc
libtest_types_a-TestUInt32.obj: TestUInt32.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt32.Tpo -c -o libtest_types_a-TestUInt32.obj `if test -f 'TestUInt32.cc'; then $(CYGPATH_W) 'TestUInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt32.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestUInt32.Tpo $(DEPDIR)/libtest_types_a-TestUInt32.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestUInt32.cc' object='libtest_types_a-TestUInt32.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt32.Tpo -c -o libtest_types_a-TestUInt32.obj `if test -f 'TestUInt32.cc'; then $(CYGPATH_W) 'TestUInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt32.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt32.Tpo $(DEPDIR)/libtest_types_a-TestUInt32.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestUInt32.cc' object='libtest_types_a-TestUInt32.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt32.obj `if test -f 'TestUInt32.cc'; then $(CYGPATH_W) 'TestUInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt32.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt32.obj `if test -f 'TestUInt32.cc'; then $(CYGPATH_W) 'TestUInt32.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt32.cc'; fi`
libtest_types_a-TestInt16.o: TestInt16.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt16.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt16.Tpo -c -o libtest_types_a-TestInt16.o `test -f 'TestInt16.cc' || echo '$(srcdir)/'`TestInt16.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestInt16.Tpo $(DEPDIR)/libtest_types_a-TestInt16.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestInt16.cc' object='libtest_types_a-TestInt16.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt16.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt16.Tpo -c -o libtest_types_a-TestInt16.o `test -f 'TestInt16.cc' || echo '$(srcdir)/'`TestInt16.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt16.Tpo $(DEPDIR)/libtest_types_a-TestInt16.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestInt16.cc' object='libtest_types_a-TestInt16.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt16.o `test -f 'TestInt16.cc' || echo '$(srcdir)/'`TestInt16.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt16.o `test -f 'TestInt16.cc' || echo '$(srcdir)/'`TestInt16.cc
libtest_types_a-TestInt16.obj: TestInt16.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt16.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt16.Tpo -c -o libtest_types_a-TestInt16.obj `if test -f 'TestInt16.cc'; then $(CYGPATH_W) 'TestInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt16.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestInt16.Tpo $(DEPDIR)/libtest_types_a-TestInt16.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestInt16.cc' object='libtest_types_a-TestInt16.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt16.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt16.Tpo -c -o libtest_types_a-TestInt16.obj `if test -f 'TestInt16.cc'; then $(CYGPATH_W) 'TestInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt16.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt16.Tpo $(DEPDIR)/libtest_types_a-TestInt16.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestInt16.cc' object='libtest_types_a-TestInt16.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt16.obj `if test -f 'TestInt16.cc'; then $(CYGPATH_W) 'TestInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt16.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt16.obj `if test -f 'TestInt16.cc'; then $(CYGPATH_W) 'TestInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt16.cc'; fi`
libtest_types_a-TestUInt16.o: TestUInt16.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt16.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt16.Tpo -c -o libtest_types_a-TestUInt16.o `test -f 'TestUInt16.cc' || echo '$(srcdir)/'`TestUInt16.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestUInt16.Tpo $(DEPDIR)/libtest_types_a-TestUInt16.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestUInt16.cc' object='libtest_types_a-TestUInt16.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt16.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt16.Tpo -c -o libtest_types_a-TestUInt16.o `test -f 'TestUInt16.cc' || echo '$(srcdir)/'`TestUInt16.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt16.Tpo $(DEPDIR)/libtest_types_a-TestUInt16.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestUInt16.cc' object='libtest_types_a-TestUInt16.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt16.o `test -f 'TestUInt16.cc' || echo '$(srcdir)/'`TestUInt16.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt16.o `test -f 'TestUInt16.cc' || echo '$(srcdir)/'`TestUInt16.cc
libtest_types_a-TestUInt16.obj: TestUInt16.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt16.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt16.Tpo -c -o libtest_types_a-TestUInt16.obj `if test -f 'TestUInt16.cc'; then $(CYGPATH_W) 'TestUInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt16.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestUInt16.Tpo $(DEPDIR)/libtest_types_a-TestUInt16.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestUInt16.cc' object='libtest_types_a-TestUInt16.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt16.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt16.Tpo -c -o libtest_types_a-TestUInt16.obj `if test -f 'TestUInt16.cc'; then $(CYGPATH_W) 'TestUInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt16.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt16.Tpo $(DEPDIR)/libtest_types_a-TestUInt16.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestUInt16.cc' object='libtest_types_a-TestUInt16.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt16.obj `if test -f 'TestUInt16.cc'; then $(CYGPATH_W) 'TestUInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt16.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt16.obj `if test -f 'TestUInt16.cc'; then $(CYGPATH_W) 'TestUInt16.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt16.cc'; fi`
libtest_types_a-TestFloat32.o: TestFloat32.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat32.Tpo -c -o libtest_types_a-TestFloat32.o `test -f 'TestFloat32.cc' || echo '$(srcdir)/'`TestFloat32.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestFloat32.Tpo $(DEPDIR)/libtest_types_a-TestFloat32.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestFloat32.cc' object='libtest_types_a-TestFloat32.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat32.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat32.Tpo -c -o libtest_types_a-TestFloat32.o `test -f 'TestFloat32.cc' || echo '$(srcdir)/'`TestFloat32.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFloat32.Tpo $(DEPDIR)/libtest_types_a-TestFloat32.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestFloat32.cc' object='libtest_types_a-TestFloat32.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat32.o `test -f 'TestFloat32.cc' || echo '$(srcdir)/'`TestFloat32.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat32.o `test -f 'TestFloat32.cc' || echo '$(srcdir)/'`TestFloat32.cc
libtest_types_a-TestFloat32.obj: TestFloat32.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat32.Tpo -c -o libtest_types_a-TestFloat32.obj `if test -f 'TestFloat32.cc'; then $(CYGPATH_W) 'TestFloat32.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat32.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestFloat32.Tpo $(DEPDIR)/libtest_types_a-TestFloat32.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestFloat32.cc' object='libtest_types_a-TestFloat32.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFloat32.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFloat32.Tpo -c -o libtest_types_a-TestFloat32.obj `if test -f 'TestFloat32.cc'; then $(CYGPATH_W) 'TestFloat32.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat32.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFloat32.Tpo $(DEPDIR)/libtest_types_a-TestFloat32.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestFloat32.cc' object='libtest_types_a-TestFloat32.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat32.obj `if test -f 'TestFloat32.cc'; then $(CYGPATH_W) 'TestFloat32.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat32.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFloat32.obj `if test -f 'TestFloat32.cc'; then $(CYGPATH_W) 'TestFloat32.cc'; else $(CYGPATH_W) '$(srcdir)/TestFloat32.cc'; fi`
libtest_types_a-TestTypeFactory.o: TestTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestTypeFactory.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo -c -o libtest_types_a-TestTypeFactory.o `test -f 'TestTypeFactory.cc' || echo '$(srcdir)/'`TestTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-TestTypeFactory.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestTypeFactory.cc' object='libtest_types_a-TestTypeFactory.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestTypeFactory.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo -c -o libtest_types_a-TestTypeFactory.o `test -f 'TestTypeFactory.cc' || echo '$(srcdir)/'`TestTypeFactory.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-TestTypeFactory.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestTypeFactory.cc' object='libtest_types_a-TestTypeFactory.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestTypeFactory.o `test -f 'TestTypeFactory.cc' || echo '$(srcdir)/'`TestTypeFactory.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestTypeFactory.o `test -f 'TestTypeFactory.cc' || echo '$(srcdir)/'`TestTypeFactory.cc
libtest_types_a-TestTypeFactory.obj: TestTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestTypeFactory.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo -c -o libtest_types_a-TestTypeFactory.obj `if test -f 'TestTypeFactory.cc'; then $(CYGPATH_W) 'TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/TestTypeFactory.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-TestTypeFactory.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestTypeFactory.cc' object='libtest_types_a-TestTypeFactory.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestTypeFactory.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo -c -o libtest_types_a-TestTypeFactory.obj `if test -f 'TestTypeFactory.cc'; then $(CYGPATH_W) 'TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/TestTypeFactory.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-TestTypeFactory.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestTypeFactory.cc' object='libtest_types_a-TestTypeFactory.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestTypeFactory.obj `if test -f 'TestTypeFactory.cc'; then $(CYGPATH_W) 'TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/TestTypeFactory.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestTypeFactory.obj `if test -f 'TestTypeFactory.cc'; then $(CYGPATH_W) 'TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/TestTypeFactory.cc'; fi`
libtest_types_a-D4TestTypeFactory.o: D4TestTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestTypeFactory.o -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo -c -o libtest_types_a-D4TestTypeFactory.o `test -f 'D4TestTypeFactory.cc' || echo '$(srcdir)/'`D4TestTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4TestTypeFactory.cc' object='libtest_types_a-D4TestTypeFactory.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestTypeFactory.o -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo -c -o libtest_types_a-D4TestTypeFactory.o `test -f 'D4TestTypeFactory.cc' || echo '$(srcdir)/'`D4TestTypeFactory.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4TestTypeFactory.cc' object='libtest_types_a-D4TestTypeFactory.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestTypeFactory.o `test -f 'D4TestTypeFactory.cc' || echo '$(srcdir)/'`D4TestTypeFactory.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestTypeFactory.o `test -f 'D4TestTypeFactory.cc' || echo '$(srcdir)/'`D4TestTypeFactory.cc
libtest_types_a-D4TestTypeFactory.obj: D4TestTypeFactory.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestTypeFactory.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo -c -o libtest_types_a-D4TestTypeFactory.obj `if test -f 'D4TestTypeFactory.cc'; then $(CYGPATH_W) 'D4TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestTypeFactory.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4TestTypeFactory.cc' object='libtest_types_a-D4TestTypeFactory.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestTypeFactory.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo -c -o libtest_types_a-D4TestTypeFactory.obj `if test -f 'D4TestTypeFactory.cc'; then $(CYGPATH_W) 'D4TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestTypeFactory.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Tpo $(DEPDIR)/libtest_types_a-D4TestTypeFactory.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4TestTypeFactory.cc' object='libtest_types_a-D4TestTypeFactory.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestTypeFactory.obj `if test -f 'D4TestTypeFactory.cc'; then $(CYGPATH_W) 'D4TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestTypeFactory.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestTypeFactory.obj `if test -f 'D4TestTypeFactory.cc'; then $(CYGPATH_W) 'D4TestTypeFactory.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestTypeFactory.cc'; fi`
libtest_types_a-TestD4Group.o: TestD4Group.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Group.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Group.Tpo -c -o libtest_types_a-TestD4Group.o `test -f 'TestD4Group.cc' || echo '$(srcdir)/'`TestD4Group.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestD4Group.Tpo $(DEPDIR)/libtest_types_a-TestD4Group.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestD4Group.cc' object='libtest_types_a-TestD4Group.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Group.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Group.Tpo -c -o libtest_types_a-TestD4Group.o `test -f 'TestD4Group.cc' || echo '$(srcdir)/'`TestD4Group.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Group.Tpo $(DEPDIR)/libtest_types_a-TestD4Group.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestD4Group.cc' object='libtest_types_a-TestD4Group.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Group.o `test -f 'TestD4Group.cc' || echo '$(srcdir)/'`TestD4Group.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Group.o `test -f 'TestD4Group.cc' || echo '$(srcdir)/'`TestD4Group.cc
libtest_types_a-TestD4Group.obj: TestD4Group.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Group.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Group.Tpo -c -o libtest_types_a-TestD4Group.obj `if test -f 'TestD4Group.cc'; then $(CYGPATH_W) 'TestD4Group.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Group.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestD4Group.Tpo $(DEPDIR)/libtest_types_a-TestD4Group.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestD4Group.cc' object='libtest_types_a-TestD4Group.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Group.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Group.Tpo -c -o libtest_types_a-TestD4Group.obj `if test -f 'TestD4Group.cc'; then $(CYGPATH_W) 'TestD4Group.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Group.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Group.Tpo $(DEPDIR)/libtest_types_a-TestD4Group.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestD4Group.cc' object='libtest_types_a-TestD4Group.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Group.obj `if test -f 'TestD4Group.cc'; then $(CYGPATH_W) 'TestD4Group.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Group.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Group.obj `if test -f 'TestD4Group.cc'; then $(CYGPATH_W) 'TestD4Group.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Group.cc'; fi`
libtest_types_a-TestInt8.o: TestInt8.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt8.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt8.Tpo -c -o libtest_types_a-TestInt8.o `test -f 'TestInt8.cc' || echo '$(srcdir)/'`TestInt8.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestInt8.Tpo $(DEPDIR)/libtest_types_a-TestInt8.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestInt8.cc' object='libtest_types_a-TestInt8.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt8.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt8.Tpo -c -o libtest_types_a-TestInt8.o `test -f 'TestInt8.cc' || echo '$(srcdir)/'`TestInt8.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt8.Tpo $(DEPDIR)/libtest_types_a-TestInt8.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestInt8.cc' object='libtest_types_a-TestInt8.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt8.o `test -f 'TestInt8.cc' || echo '$(srcdir)/'`TestInt8.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt8.o `test -f 'TestInt8.cc' || echo '$(srcdir)/'`TestInt8.cc
libtest_types_a-TestInt8.obj: TestInt8.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt8.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt8.Tpo -c -o libtest_types_a-TestInt8.obj `if test -f 'TestInt8.cc'; then $(CYGPATH_W) 'TestInt8.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt8.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestInt8.Tpo $(DEPDIR)/libtest_types_a-TestInt8.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestInt8.cc' object='libtest_types_a-TestInt8.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt8.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt8.Tpo -c -o libtest_types_a-TestInt8.obj `if test -f 'TestInt8.cc'; then $(CYGPATH_W) 'TestInt8.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt8.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt8.Tpo $(DEPDIR)/libtest_types_a-TestInt8.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestInt8.cc' object='libtest_types_a-TestInt8.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt8.obj `if test -f 'TestInt8.cc'; then $(CYGPATH_W) 'TestInt8.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt8.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt8.obj `if test -f 'TestInt8.cc'; then $(CYGPATH_W) 'TestInt8.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt8.cc'; fi`
libtest_types_a-TestInt64.o: TestInt64.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt64.Tpo -c -o libtest_types_a-TestInt64.o `test -f 'TestInt64.cc' || echo '$(srcdir)/'`TestInt64.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestInt64.Tpo $(DEPDIR)/libtest_types_a-TestInt64.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestInt64.cc' object='libtest_types_a-TestInt64.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt64.Tpo -c -o libtest_types_a-TestInt64.o `test -f 'TestInt64.cc' || echo '$(srcdir)/'`TestInt64.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt64.Tpo $(DEPDIR)/libtest_types_a-TestInt64.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestInt64.cc' object='libtest_types_a-TestInt64.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt64.o `test -f 'TestInt64.cc' || echo '$(srcdir)/'`TestInt64.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt64.o `test -f 'TestInt64.cc' || echo '$(srcdir)/'`TestInt64.cc
libtest_types_a-TestInt64.obj: TestInt64.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt64.Tpo -c -o libtest_types_a-TestInt64.obj `if test -f 'TestInt64.cc'; then $(CYGPATH_W) 'TestInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt64.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestInt64.Tpo $(DEPDIR)/libtest_types_a-TestInt64.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestInt64.cc' object='libtest_types_a-TestInt64.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestInt64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestInt64.Tpo -c -o libtest_types_a-TestInt64.obj `if test -f 'TestInt64.cc'; then $(CYGPATH_W) 'TestInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt64.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestInt64.Tpo $(DEPDIR)/libtest_types_a-TestInt64.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestInt64.cc' object='libtest_types_a-TestInt64.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt64.obj `if test -f 'TestInt64.cc'; then $(CYGPATH_W) 'TestInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt64.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestInt64.obj `if test -f 'TestInt64.cc'; then $(CYGPATH_W) 'TestInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestInt64.cc'; fi`
libtest_types_a-TestUInt64.o: TestUInt64.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt64.Tpo -c -o libtest_types_a-TestUInt64.o `test -f 'TestUInt64.cc' || echo '$(srcdir)/'`TestUInt64.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestUInt64.Tpo $(DEPDIR)/libtest_types_a-TestUInt64.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestUInt64.cc' object='libtest_types_a-TestUInt64.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt64.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt64.Tpo -c -o libtest_types_a-TestUInt64.o `test -f 'TestUInt64.cc' || echo '$(srcdir)/'`TestUInt64.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt64.Tpo $(DEPDIR)/libtest_types_a-TestUInt64.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestUInt64.cc' object='libtest_types_a-TestUInt64.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt64.o `test -f 'TestUInt64.cc' || echo '$(srcdir)/'`TestUInt64.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt64.o `test -f 'TestUInt64.cc' || echo '$(srcdir)/'`TestUInt64.cc
libtest_types_a-TestUInt64.obj: TestUInt64.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt64.Tpo -c -o libtest_types_a-TestUInt64.obj `if test -f 'TestUInt64.cc'; then $(CYGPATH_W) 'TestUInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt64.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestUInt64.Tpo $(DEPDIR)/libtest_types_a-TestUInt64.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestUInt64.cc' object='libtest_types_a-TestUInt64.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestUInt64.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestUInt64.Tpo -c -o libtest_types_a-TestUInt64.obj `if test -f 'TestUInt64.cc'; then $(CYGPATH_W) 'TestUInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt64.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestUInt64.Tpo $(DEPDIR)/libtest_types_a-TestUInt64.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestUInt64.cc' object='libtest_types_a-TestUInt64.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt64.obj `if test -f 'TestUInt64.cc'; then $(CYGPATH_W) 'TestUInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt64.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestUInt64.obj `if test -f 'TestUInt64.cc'; then $(CYGPATH_W) 'TestUInt64.cc'; else $(CYGPATH_W) '$(srcdir)/TestUInt64.cc'; fi`
libtest_types_a-TestD4Sequence.o: TestD4Sequence.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Sequence.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo -c -o libtest_types_a-TestD4Sequence.o `test -f 'TestD4Sequence.cc' || echo '$(srcdir)/'`TestD4Sequence.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo $(DEPDIR)/libtest_types_a-TestD4Sequence.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestD4Sequence.cc' object='libtest_types_a-TestD4Sequence.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Sequence.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo -c -o libtest_types_a-TestD4Sequence.o `test -f 'TestD4Sequence.cc' || echo '$(srcdir)/'`TestD4Sequence.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo $(DEPDIR)/libtest_types_a-TestD4Sequence.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestD4Sequence.cc' object='libtest_types_a-TestD4Sequence.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Sequence.o `test -f 'TestD4Sequence.cc' || echo '$(srcdir)/'`TestD4Sequence.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Sequence.o `test -f 'TestD4Sequence.cc' || echo '$(srcdir)/'`TestD4Sequence.cc
libtest_types_a-TestD4Sequence.obj: TestD4Sequence.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Sequence.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo -c -o libtest_types_a-TestD4Sequence.obj `if test -f 'TestD4Sequence.cc'; then $(CYGPATH_W) 'TestD4Sequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Sequence.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo $(DEPDIR)/libtest_types_a-TestD4Sequence.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestD4Sequence.cc' object='libtest_types_a-TestD4Sequence.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Sequence.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo -c -o libtest_types_a-TestD4Sequence.obj `if test -f 'TestD4Sequence.cc'; then $(CYGPATH_W) 'TestD4Sequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Sequence.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Sequence.Tpo $(DEPDIR)/libtest_types_a-TestD4Sequence.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestD4Sequence.cc' object='libtest_types_a-TestD4Sequence.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Sequence.obj `if test -f 'TestD4Sequence.cc'; then $(CYGPATH_W) 'TestD4Sequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Sequence.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Sequence.obj `if test -f 'TestD4Sequence.cc'; then $(CYGPATH_W) 'TestD4Sequence.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Sequence.cc'; fi`
libtest_types_a-TestD4Enum.o: TestD4Enum.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Enum.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo -c -o libtest_types_a-TestD4Enum.o `test -f 'TestD4Enum.cc' || echo '$(srcdir)/'`TestD4Enum.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo $(DEPDIR)/libtest_types_a-TestD4Enum.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestD4Enum.cc' object='libtest_types_a-TestD4Enum.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Enum.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo -c -o libtest_types_a-TestD4Enum.o `test -f 'TestD4Enum.cc' || echo '$(srcdir)/'`TestD4Enum.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo $(DEPDIR)/libtest_types_a-TestD4Enum.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestD4Enum.cc' object='libtest_types_a-TestD4Enum.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Enum.o `test -f 'TestD4Enum.cc' || echo '$(srcdir)/'`TestD4Enum.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Enum.o `test -f 'TestD4Enum.cc' || echo '$(srcdir)/'`TestD4Enum.cc
libtest_types_a-TestD4Enum.obj: TestD4Enum.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Enum.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo -c -o libtest_types_a-TestD4Enum.obj `if test -f 'TestD4Enum.cc'; then $(CYGPATH_W) 'TestD4Enum.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Enum.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo $(DEPDIR)/libtest_types_a-TestD4Enum.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestD4Enum.cc' object='libtest_types_a-TestD4Enum.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Enum.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo -c -o libtest_types_a-TestD4Enum.obj `if test -f 'TestD4Enum.cc'; then $(CYGPATH_W) 'TestD4Enum.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Enum.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Enum.Tpo $(DEPDIR)/libtest_types_a-TestD4Enum.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestD4Enum.cc' object='libtest_types_a-TestD4Enum.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Enum.obj `if test -f 'TestD4Enum.cc'; then $(CYGPATH_W) 'TestD4Enum.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Enum.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Enum.obj `if test -f 'TestD4Enum.cc'; then $(CYGPATH_W) 'TestD4Enum.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Enum.cc'; fi`
libtest_types_a-TestD4Opaque.o: TestD4Opaque.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Opaque.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo -c -o libtest_types_a-TestD4Opaque.o `test -f 'TestD4Opaque.cc' || echo '$(srcdir)/'`TestD4Opaque.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo $(DEPDIR)/libtest_types_a-TestD4Opaque.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestD4Opaque.cc' object='libtest_types_a-TestD4Opaque.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Opaque.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo -c -o libtest_types_a-TestD4Opaque.o `test -f 'TestD4Opaque.cc' || echo '$(srcdir)/'`TestD4Opaque.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo $(DEPDIR)/libtest_types_a-TestD4Opaque.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestD4Opaque.cc' object='libtest_types_a-TestD4Opaque.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Opaque.o `test -f 'TestD4Opaque.cc' || echo '$(srcdir)/'`TestD4Opaque.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Opaque.o `test -f 'TestD4Opaque.cc' || echo '$(srcdir)/'`TestD4Opaque.cc
libtest_types_a-TestD4Opaque.obj: TestD4Opaque.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Opaque.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo -c -o libtest_types_a-TestD4Opaque.obj `if test -f 'TestD4Opaque.cc'; then $(CYGPATH_W) 'TestD4Opaque.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Opaque.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo $(DEPDIR)/libtest_types_a-TestD4Opaque.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestD4Opaque.cc' object='libtest_types_a-TestD4Opaque.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestD4Opaque.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo -c -o libtest_types_a-TestD4Opaque.obj `if test -f 'TestD4Opaque.cc'; then $(CYGPATH_W) 'TestD4Opaque.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Opaque.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestD4Opaque.Tpo $(DEPDIR)/libtest_types_a-TestD4Opaque.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestD4Opaque.cc' object='libtest_types_a-TestD4Opaque.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Opaque.obj `if test -f 'TestD4Opaque.cc'; then $(CYGPATH_W) 'TestD4Opaque.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Opaque.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestD4Opaque.obj `if test -f 'TestD4Opaque.cc'; then $(CYGPATH_W) 'TestD4Opaque.cc'; else $(CYGPATH_W) '$(srcdir)/TestD4Opaque.cc'; fi`
libtest_types_a-TestFunction.o: TestFunction.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFunction.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFunction.Tpo -c -o libtest_types_a-TestFunction.o `test -f 'TestFunction.cc' || echo '$(srcdir)/'`TestFunction.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestFunction.Tpo $(DEPDIR)/libtest_types_a-TestFunction.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestFunction.cc' object='libtest_types_a-TestFunction.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFunction.o -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFunction.Tpo -c -o libtest_types_a-TestFunction.o `test -f 'TestFunction.cc' || echo '$(srcdir)/'`TestFunction.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFunction.Tpo $(DEPDIR)/libtest_types_a-TestFunction.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestFunction.cc' object='libtest_types_a-TestFunction.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFunction.o `test -f 'TestFunction.cc' || echo '$(srcdir)/'`TestFunction.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFunction.o `test -f 'TestFunction.cc' || echo '$(srcdir)/'`TestFunction.cc
libtest_types_a-TestFunction.obj: TestFunction.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFunction.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFunction.Tpo -c -o libtest_types_a-TestFunction.obj `if test -f 'TestFunction.cc'; then $(CYGPATH_W) 'TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/TestFunction.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-TestFunction.Tpo $(DEPDIR)/libtest_types_a-TestFunction.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='TestFunction.cc' object='libtest_types_a-TestFunction.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-TestFunction.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-TestFunction.Tpo -c -o libtest_types_a-TestFunction.obj `if test -f 'TestFunction.cc'; then $(CYGPATH_W) 'TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/TestFunction.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-TestFunction.Tpo $(DEPDIR)/libtest_types_a-TestFunction.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='TestFunction.cc' object='libtest_types_a-TestFunction.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFunction.obj `if test -f 'TestFunction.cc'; then $(CYGPATH_W) 'TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/TestFunction.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-TestFunction.obj `if test -f 'TestFunction.cc'; then $(CYGPATH_W) 'TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/TestFunction.cc'; fi`
libtest_types_a-D4TestFunction.o: D4TestFunction.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestFunction.o -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo -c -o libtest_types_a-D4TestFunction.o `test -f 'D4TestFunction.cc' || echo '$(srcdir)/'`D4TestFunction.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo $(DEPDIR)/libtest_types_a-D4TestFunction.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4TestFunction.cc' object='libtest_types_a-D4TestFunction.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestFunction.o -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo -c -o libtest_types_a-D4TestFunction.o `test -f 'D4TestFunction.cc' || echo '$(srcdir)/'`D4TestFunction.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo $(DEPDIR)/libtest_types_a-D4TestFunction.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4TestFunction.cc' object='libtest_types_a-D4TestFunction.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestFunction.o `test -f 'D4TestFunction.cc' || echo '$(srcdir)/'`D4TestFunction.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestFunction.o `test -f 'D4TestFunction.cc' || echo '$(srcdir)/'`D4TestFunction.cc
libtest_types_a-D4TestFunction.obj: D4TestFunction.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestFunction.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo -c -o libtest_types_a-D4TestFunction.obj `if test -f 'D4TestFunction.cc'; then $(CYGPATH_W) 'D4TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestFunction.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo $(DEPDIR)/libtest_types_a-D4TestFunction.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='D4TestFunction.cc' object='libtest_types_a-D4TestFunction.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -MT libtest_types_a-D4TestFunction.obj -MD -MP -MF $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo -c -o libtest_types_a-D4TestFunction.obj `if test -f 'D4TestFunction.cc'; then $(CYGPATH_W) 'D4TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestFunction.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtest_types_a-D4TestFunction.Tpo $(DEPDIR)/libtest_types_a-D4TestFunction.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='D4TestFunction.cc' object='libtest_types_a-D4TestFunction.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestFunction.obj `if test -f 'D4TestFunction.cc'; then $(CYGPATH_W) 'D4TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestFunction.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_types_a_CXXFLAGS) $(CXXFLAGS) -c -o libtest_types_a-D4TestFunction.obj `if test -f 'D4TestFunction.cc'; then $(CYGPATH_W) 'D4TestFunction.cc'; else $(CYGPATH_W) '$(srcdir)/D4TestFunction.cc'; fi`
mostlyclean-libtool:
-rm -f *.lo
@@ -1321,8 +1440,11 @@ clean-libtool:
-rm -rf .libs _libs
install-testheadersHEADERS: $(testheaders_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(testheadersdir)" || $(MKDIR_P) "$(DESTDIR)$(testheadersdir)"
@list='$(testheaders_HEADERS)'; test -n "$(testheadersdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(testheadersdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(testheadersdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -1336,30 +1458,17 @@ uninstall-testheadersHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(testheaders_HEADERS)'; test -n "$(testheadersdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(testheadersdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(testheadersdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ dir='$(DESTDIR)$(testheadersdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -1371,15 +1480,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -1388,6 +1493,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1441,10 +1561,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -1531,21 +1656,21 @@ uninstall-am: uninstall-libLIBRARIES uninstall-testheadersHEADERS
.MAKE: check-am install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
clean-checkPROGRAMS clean-generic clean-libLIBRARIES \
- clean-libtool clean-local ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-local \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libLIBRARIES install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip \
- install-testheadersHEADERS installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-libLIBRARIES \
+ clean-libtool clean-local cscopelist-am ctags ctags-am \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-local distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-libLIBRARIES install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip install-testheadersHEADERS installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-libLIBRARIES \
uninstall-testheadersHEADERS
diff --git a/tests/TestArray.cc b/tests/TestArray.cc
index c1d50d2..a5a7ac0 100644
--- a/tests/TestArray.cc
+++ b/tests/TestArray.cc
@@ -536,12 +536,13 @@ bool TestArray::read()
case dods_opaque_c:
case dods_structure_c:
+ vec_resize(array_len);
for (unsigned i = 0; i < array_len; ++i) {
// Copy the prototype and read a value into it
BaseType *elem = var()->ptr_duplicate();
elem->read();
// Load the new value into this object's array
- set_vec(i, elem);
+ set_vec_nocopy(i, elem); // Use set_vec_nocopy() TODO (and below)
}
set_read_p(true);
break;
@@ -550,12 +551,10 @@ bool TestArray::read()
// No sequence arrays in DAP2
if (!is_dap4()) throw InternalErr(__FILE__, __LINE__, "Bad data type");
+ vec_resize(array_len);
for (unsigned i = 0; i < array_len; ++i) {
- // Copy the prototype and read a value into it
- BaseType *elem = var()->ptr_duplicate();
- //elem->read();
- // Load the new value into this object's array
- set_vec(i, elem);
+ // Load the new BaseType (a D4Sequence) into the array element
+ set_vec_nocopy(i, var()->ptr_duplicate());
}
break;
diff --git a/tests/TestSequence.cc b/tests/TestSequence.cc
index 80325e7..87693c6 100644
--- a/tests/TestSequence.cc
+++ b/tests/TestSequence.cc
@@ -95,18 +95,12 @@ TestSequence::operator=(const TestSequence &rhs)
return *this;
}
-BaseType *
+void
TestSequence::transform_to_dap4(D4Group *root, Constructor *container)
{
-
- D4Sequence *dest = new TestD4Sequence(name());
-
+ TestD4Sequence *dest = new TestD4Sequence(name());
Constructor::transform_to_dap4(root, dest);
-
- dest->set_length(-1);
- dest->set_parent(container);
-
- return dest;
+ container->add_var_nocopy(dest);
}
void TestSequence::output_values(std::ostream &out)
diff --git a/tests/TestSequence.h b/tests/TestSequence.h
index b4a60b3..f9b465b 100644
--- a/tests/TestSequence.h
+++ b/tests/TestSequence.h
@@ -63,7 +63,7 @@ public:
TestSequence &operator=(const TestSequence &rhs);
virtual BaseType *ptr_duplicate();
- BaseType * transform_to_dap4(libdap::D4Group *root, libdap::Constructor *container);
+ virtual void transform_to_dap4(libdap::D4Group *root, libdap::Constructor *container);
virtual bool read();
diff --git a/tests/TestStructure.cc b/tests/TestStructure.cc
index 666b5c0..d891ac5 100644
--- a/tests/TestStructure.cc
+++ b/tests/TestStructure.cc
@@ -117,15 +117,12 @@ void TestStructure::output_values(std::ostream &out)
out << " }";
}
-BaseType *
+void
TestStructure::transform_to_dap4(D4Group *root, Constructor *container)
{
- Structure *dest = new TestStructure(name(), dataset());
-
+ TestStructure *dest = new TestStructure(name(), dataset());
Constructor::transform_to_dap4(root, dest);
- dest->set_parent(container);
-
- return dest;
+ container->add_var_nocopy(dest);
}
// For this `Test' class, run the read mfunc for each of variables which
diff --git a/tests/TestStructure.h b/tests/TestStructure.h
index bdcfe75..a03996b 100644
--- a/tests/TestStructure.h
+++ b/tests/TestStructure.h
@@ -60,7 +60,7 @@ public:
TestStructure &operator=(const TestStructure &rhs);
virtual BaseType *ptr_duplicate();
- BaseType *transform_to_dap4(libdap::D4Group *root, libdap::Constructor *container);
+ virtual void transform_to_dap4(libdap::D4Group *root, libdap::Constructor *container);
virtual bool read();
diff --git a/tests/getdapTest b/tests/getdapTest
index 5872be5..4761ed2 100755
--- a/tests/getdapTest
+++ b/tests/getdapTest
@@ -1,17 +1,17 @@
#! /bin/sh
-# Generated from getdapTest.at by GNU Autoconf 2.63.
+# Generated from getdapTest.at by GNU Autoconf 2.69.
+#
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
#
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
# This test suite is free software; the Free Software Foundation gives
# unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,23 +19,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -43,7 +35,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -54,7 +52,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -77,13 +75,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -93,15 +84,16 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -113,12 +105,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -130,330 +126,319 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # 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
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-if as_func_ret_success; then
- :
else
- exitcode=1
- echo as_func_ret_success failed.
+ exitcode=1; echo positional parameters were not saved.
fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # 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 ;;
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
fi
-
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
- done
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-fi
-fi
+} # as_fn_mkdir_p
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
+ as_expr=false
fi
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_basename=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf at gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
-
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -470,10 +455,12 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -482,29 +469,18 @@ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell"
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -519,49 +495,29 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -591,6 +547,11 @@ at_errexit_p=false
# Shall we be verbose? ':' means no, empty means yes.
at_verbose=:
at_quiet=
+# Running several jobs in parallel, 0 means as many as test groups.
+at_jobs=1
+at_traceon=:
+at_trace_echo=:
+at_check_filter_trace=:
# Shall we keep the debug scripts? Must be `:' when the suite is
# run by a debug script, so that the script doesn't remove itself.
@@ -605,6 +566,8 @@ at_list_p=false
at_clean=false
# Test groups to run
at_groups=
+# Whether to rerun failed tests.
+at_recheck=
# Whether a write failure occurred
at_write_fail=0
@@ -618,10 +581,10 @@ esac
# Whether -C is in effect.
at_change_dir=false
+# Whether to enable colored test results.
+at_color=no
# List of the tested programs.
at_tested=''
-# List of the all the test groups.
-at_groups_all=' 1'
# As many question marks as there are digits in the last test group number.
# Used to normalize the test group numbers so that `ls' lists them in
# numerical order.
@@ -629,12 +592,14 @@ at_format='?'
# Description of all the test groups.
at_help_all="1;getdapTest.at:34;getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc getdap-testsuite/fnoc1.nc.dds (pass);getdap;
"
+# List of the all the test groups.
+at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
-# at_func_validate_ranges [NAME...]
-# ---------------------------------
-# Validate and normalize the test group number contained in each
-# variable NAME. Leading zeroes are treated as decimal.
-at_func_validate_ranges ()
+# at_fn_validate_ranges NAME...
+# -----------------------------
+# Validate and normalize the test group number contained in each variable
+# NAME. Leading zeroes are treated as decimal.
+at_fn_validate_ranges ()
{
for at_grp
do
@@ -645,7 +610,7 @@ at_func_validate_ranges ()
fi
case $at_value in
0*) # We want to treat leading 0 as decimal, like expr and test, but
- # at_func_arith treats it as octal if it uses $(( )).
+ # AS_VAR_ARITH treats it as octal if it uses $(( )).
# With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
# expr fork, but it is not worth the effort to determine if the
# shell supports XSI when the user can just avoid leading 0.
@@ -664,8 +629,8 @@ do
fi
case $at_option in
- *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
- *) at_optarg= ;;
+ *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
+ *) at_optarg= ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -687,6 +652,19 @@ do
at_clean=:
;;
+ --color )
+ at_color=always
+ ;;
+ --color=* )
+ case $at_optarg in
+ no | never | none) at_color=never ;;
+ auto | tty | if-tty) at_color=auto ;;
+ always | yes | force) at_color=always ;;
+ *) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
+ as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
+ esac
+ ;;
+
--debug | -d )
at_debug_p=:
;;
@@ -701,29 +679,31 @@ do
;;
--trace | -x )
- at_traceon='set -x'; at_traceoff='set +x'
+ at_traceon='set -x'
+ at_trace_echo=echo
+ at_check_filter_trace=at_fn_filter_trace
;;
[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
- at_func_validate_ranges at_option
- at_groups="$at_groups$at_option "
+ at_fn_validate_ranges at_option
+ as_fn_append at_groups "$at_option$as_nl"
;;
# Ranges
[0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
at_range_start=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_start
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.* \('$at_range_start' \)/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,$p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
-[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
at_range_end=`echo $at_option |tr -d X-`
- at_func_validate_ranges at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '1,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
[0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -739,11 +719,10 @@ do
at_range_end=$at_range_start
at_range_start=$at_tmp
fi
- at_func_validate_ranges at_range_start at_range_end
- at_range=`$as_echo " $at_groups_all " | \
- sed -e 's/^.*\( '$at_range_start' \)/\1/' \
- -e 's/\( '$at_range_end'\) .*$/\1/'`
- at_groups="$at_groups$at_range "
+ at_fn_validate_ranges at_range_start at_range_end
+ at_range=`$as_echo "$at_groups_all" | \
+ sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
+ as_fn_append at_groups "$at_range$as_nl"
;;
# Directory selection.
@@ -753,6 +732,25 @@ do
--directory=* )
at_change_dir=:
at_dir=$at_optarg
+ if test x- = "x$at_dir" ; then
+ at_dir=./-
+ fi
+ ;;
+
+ # Parallel execution.
+ --jobs | -j )
+ at_jobs=0
+ ;;
+ --jobs=* | -j[0-9]* )
+ if test -n "$at_optarg"; then
+ at_jobs=$at_optarg
+ else
+ at_jobs=`expr X$at_option : 'X-j\(.*\)'`
+ fi
+ case $at_jobs in *[!0-9]*)
+ at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
+ as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
+ esac
;;
# Keywords.
@@ -779,11 +777,12 @@ do
at_groups_selected=`$as_echo "$at_groups_selected" |
grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
done
- # Smash the newlines.
- at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
- tr "$as_nl" ' '
- `
- at_groups="$at_groups$at_groups_selected "
+ # Smash the keywords.
+ at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
+ as_fn_append at_groups "$at_groups_selected$as_nl"
+ ;;
+ --recheck)
+ at_recheck=:
;;
*=*)
@@ -791,14 +790,12 @@ do
# Reject names that are not valid shell variable names.
case $at_envvar in
'' | [0-9]* | *[!_$as_cr_alnum]* )
- { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
-$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
esac
at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
# Export now, but save eval for later and for debug scripts.
export $at_envvar
- at_debug_args="$at_debug_args $at_envvar='$at_value'"
+ as_fn_append at_debug_args " $at_envvar='$at_value'"
;;
*) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -809,19 +806,42 @@ $as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
done
# Verify our last option didn't require an argument
-if test -n "$at_prev"; then
- { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
-$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
- { (exit 1); exit 1; }; }
+if test -n "$at_prev"; then :
+ as_fn_error $? "\`$at_prev' requires an argument"
fi
+# The file containing the suite.
+at_suite_log=$at_dir/$as_me.log
# Selected test groups.
-if test -z "$at_groups"; then
+if test -z "$at_groups$at_recheck"; then
at_groups=$at_groups_all
else
+ if test -n "$at_recheck" && test -r "$at_suite_log"; then
+ at_oldfails=`sed -n '
+ /^Failed tests:$/,/^Skipped tests:$/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^Unexpected passes:$/,/^## Detailed failed tests/{
+ s/^[ ]*\([1-9][0-9]*\):.*/\1/p
+ }
+ /^## Detailed failed tests/q
+ ' "$at_suite_log"`
+ as_fn_append at_groups "$at_oldfails$as_nl"
+ fi
# Sort the tests, removing duplicates.
- at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
+ at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
+fi
+
+if test x"$at_color" = xalways \
+ || { test x"$at_color" = xauto && test -t 1; }; then
+ at_red=`printf '\033[0;31m'`
+ at_grn=`printf '\033[0;32m'`
+ at_lgn=`printf '\033[1;32m'`
+ at_blu=`printf '\033[1;34m'`
+ at_std=`printf '\033[m'`
+else
+ at_red= at_grn= at_lgn= at_blu= at_std=
fi
# Help message.
@@ -832,16 +852,17 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
Run all the tests, or the selected TESTS, given by numeric ranges, and
save a detailed log file. Upon failure, create debugging scripts.
-You should not change environment variables unless explicitly passed
-as command line arguments. Set \`AUTOTEST_PATH' to select the executables
+Do not change environment variables directly. Instead, set them via
+command line arguments. Set \`AUTOTEST_PATH' to select the executables
to exercise. Each relative directory is expanded as build and source
-directories relatively to the top level of this distribution. E.g.,
+directories relative to the top level of this distribution.
+E.g., from within the build directory /tmp/foo-1.0, invoking this:
$ $0 AUTOTEST_PATH=bin
-possibly amounts into
+is equivalent to the following, assuming the source directory is /src/foo-1.0:
- PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
+ PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
_ATEOF
cat <<_ATEOF || at_write_fail=1
@@ -856,9 +877,14 @@ cat <<_ATEOF || at_write_fail=1
Execution tuning:
-C, --directory=DIR
change to directory DIR before starting
+ --color[=never|auto|always]
+ enable colored test results on terminal, or always
+ -j, --jobs[=N]
+ Allow N jobs at once; infinite jobs with no arg (default 1)
-k, --keywords=KEYWORDS
select the tests matching all the comma-separated KEYWORDS
multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
+ --recheck select all tests that failed or passed unexpectedly last time
-e, --errexit abort as soon as a test fails; implies --debug
-v, --verbose force more detailed output
default for debugging scripts
@@ -876,64 +902,69 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-libdap 3.18.3 test suite: getdap test groups:
+libdap 3.19.0 test suite: getdap test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
_ATEOF
- # Passing at_groups is tricky. We cannot use it to form a literal string
- # or regexp because of the limitation of AIX awk. And Solaris' awk
- # doesn't grok more than 99 fields in a record, so we have to use `split'.
- # at_groups needs to be space-separated for this script to work.
- case $at_groups in
- *"$as_nl"* )
- at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
- esac
- $as_echo "$at_groups$as_nl$at_help_all" |
- awk 'BEGIN { FS = ";" }
- NR == 1 {
- for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
+ # Pass an empty line as separator between selected groups and help.
+ $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
+ awk 'NF == 1 && FS != ";" {
+ selected[$ 1] = 1
next
}
- {
+ /^$/ { FS = ";" }
+ NF > 0 {
if (selected[$ 1]) {
printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
- if ($ 4) printf " %s\n", $ 4
+ if ($ 4) {
+ lmax = 79
+ indent = " "
+ line = indent
+ len = length (line)
+ n = split ($ 4, a, " ")
+ for (i = 1; i <= n; i++) {
+ l = length (a[i]) + 1
+ if (i > 1 && len + l > lmax) {
+ print line
+ line = indent " " a[i]
+ len = length (line)
+ } else {
+ line = line " " a[i]
+ len += l
+ }
+ }
+ if (n)
+ print line
+ }
}
}' || at_write_fail=1
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (libdap 3.18.3)" &&
- cat <<\_ACEOF || at_write_fail=1
+ $as_echo "$as_me (libdap 3.19.0)" &&
+ cat <<\_ATEOF || at_write_fail=1
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This test suite is free software; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
-_ACEOF
+_ATEOF
exit $at_write_fail
fi
-# Should we print banners? at_groups is space-separated for entire test,
-# newline-separated if only a subset of the testsuite is run.
-case $at_groups in
- *' '*' '* | *"$as_nl"*"$as_nl"* )
- at_print_banners=: ;;
+# Should we print banners? Yes if more than one test is run.
+case $at_groups in #(
+ *$as_nl* )
+ at_print_banners=: ;; #(
* ) at_print_banners=false ;;
esac
-# Text for banner N, set to empty once printed.
+# Text for banner N, set to a single space once printed.
# Take any -C into account.
if $at_change_dir ; then
- if test x- = "x$at_dir" ; then
- at_dir=./-
- fi
test x != "x$at_dir" && cd "$at_dir" \
- || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
-$as_echo "$as_me: error: unable to change directory" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error $? "unable to change directory"
at_dir=`pwd`
fi
@@ -941,13 +972,11 @@ fi
for at_file in atconfig atlocal
do
test -r $at_file || continue
- . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
-$as_echo "$as_me: error: invalid content: $at_file" >&2;}
- { (exit 1); exit 1; }; }
+ . ./$at_file || as_fn_error $? "invalid content: $at_file"
done
# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: ${at_top_build_prefix=$at_top_builddir}
+: "${at_top_build_prefix=$at_top_builddir}"
# Perform any assignments requested during argument parsing.
eval "$at_debug_args"
@@ -958,8 +987,7 @@ if test -n "$at_top_srcdir"; then
builddir=../..
for at_dir_var in srcdir top_srcdir top_build_prefix
do
- at_val=`eval 'as_val=${'at_$at_dir_var'}
- $as_echo "$as_val"'`
+ eval at_val=\$at_$at_dir_var
case $at_val in
[\\/$]* | ?:[\\/]* ) at_prefix= ;;
*) at_prefix=../../ ;;
@@ -968,9 +996,9 @@ if test -n "$at_top_srcdir"; then
done
fi
-## ------------------- ##
-## Directory structure ##
-## ------------------- ##
+## -------------------- ##
+## Directory structure. ##
+## -------------------- ##
# This is the set of directories and files used by this script
# (non-literals are capitalized):
@@ -1001,12 +1029,14 @@ fi
# The directory the whole suite works in.
# Should be absolute to let the user `cd' at will.
at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite.
+# The file containing the suite ($at_dir might have changed since earlier).
at_suite_log=$at_dir/$as_me.log
# The directory containing helper files per test group.
at_helper_dir=$at_suite_dir/at-groups
# Stop file: if it exists, do not start new jobs.
at_stop_file=$at_suite_dir/at-stop
+# The fifo used for the job dispatcher.
+at_job_fifo=$at_suite_dir/at-job-fifo
if $at_clean; then
test -d "$at_suite_dir" &&
@@ -1030,23 +1060,23 @@ for as_dir in $AUTOTEST_PATH $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
+ test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
case $as_dir in
[\\/]* | ?:[\\/]* )
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
;;
* )
if test -z "$at_top_build_prefix"; then
# Stand-alone test suite.
- at_path=$at_path$as_dir
+ as_fn_append at_path "$as_dir"
else
# Embedded test suite.
- at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
- at_path=$at_path$at_top_srcdir/$as_dir
+ as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
+ as_fn_append at_path "$at_top_srcdir/$as_dir"
fi
;;
esac
-done
+ done
IFS=$as_save_IFS
@@ -1060,7 +1090,7 @@ for as_dir in $at_path
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -d "$as_dir" || continue
+ test -d "$as_dir" || continue
case $as_dir in
[\\/]* | ?:[\\/]* ) ;;
* ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1068,15 +1098,18 @@ esac
case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
*$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
$PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
- *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
+ *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
esac
-done
+ done
IFS=$as_save_IFS
PATH=$at_new_path
export PATH
# Setting up the FDs.
+
+
+
# 5 is the log file. Not to be overwritten if `-d'.
if $at_debug_p; then
at_suite_log=/dev/null
@@ -1086,43 +1119,28 @@ fi
exec 5>>"$at_suite_log"
# Banners and logs.
-cat <<\_ASBOX
-## --------------------------------- ##
-## libdap 3.18.3 test suite: getdap. ##
-## --------------------------------- ##
-_ASBOX
+$as_echo "## --------------------------------- ##
+## libdap 3.19.0 test suite: getdap. ##
+## --------------------------------- ##"
{
- cat <<\_ASBOX
-## --------------------------------- ##
-## libdap 3.18.3 test suite: getdap. ##
-## --------------------------------- ##
-_ASBOX
+ $as_echo "## --------------------------------- ##
+## libdap 3.19.0 test suite: getdap. ##
+## --------------------------------- ##"
echo
$as_echo "$as_me: command line was:"
$as_echo " \$ $0 $at_cli_args"
echo
- # Try to find a few ChangeLogs in case it might help determining the
- # exact version. Use the relative dir: if the top dir is a symlink,
- # find will not follow it (and options to follow the links are not
- # portable), which would result in no output here. Prune directories
- # matching the package tarname, since they tend to be leftovers from
- # `make dist' or `make distcheck' and contain redundant or stale logs.
- if test -n "$at_top_srcdir"; then
- cat <<\_ASBOX
-## ----------- ##
-## ChangeLogs. ##
-## ----------- ##
-_ASBOX
+ # If ChangeLog exists, list a few lines in case it might help determining
+ # the exact version.
+ if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
+ $as_echo "## ---------- ##
+## ChangeLog. ##
+## ---------- ##"
+ echo
+ sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
echo
- for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
- do
- $as_echo "$as_me: $at_file:"
- sed 's/^/| /;10q' $at_file
- echo
- done
-
fi
{
@@ -1155,8 +1173,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
}
@@ -1173,53 +1191,80 @@ IFS=$as_save_IFS
} >&5
-## --------------- ##
-## Shell functions ##
-## --------------- ##
+## ------------------------- ##
+## Autotest shell functions. ##
+## ------------------------- ##
-# at_func_banner NUMBER
-# ---------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups
-# and this particular banner has not yet been printed.
-at_func_banner ()
+# at_fn_banner NUMBER
+# -------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups and
+# this particular banner has not yet been printed.
+at_fn_banner ()
{
$at_print_banners || return 0
eval at_banner_text=\$at_banner_text_$1
- test "x$at_banner_text" = x && return 0
- eval at_banner_text_$1=
- $as_echo "$as_nl$at_banner_text$as_nl"
-} # at_func_banner
+ test "x$at_banner_text" = "x " && return 0
+ eval "at_banner_text_$1=\" \""
+ if test -z "$at_banner_text"; then
+ $at_first || echo
+ else
+ $as_echo "$as_nl$at_banner_text$as_nl"
+ fi
+} # at_fn_banner
-# at_func_check_newline COMMAND
-# -----------------------------
-# Test if COMMAND includes a newline and, if so, print a message and return
-# exit code 1
-at_func_check_newline ()
+# at_fn_check_prepare_notrace REASON LINE
+# ---------------------------------------
+# Perform AT_CHECK preparations for the command at LINE for an untraceable
+# command; REASON is the reason for disabling tracing.
+at_fn_check_prepare_notrace ()
{
- case "$1" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
- return 1 ;;
- *) return 0 ;;
- esac
+ $at_trace_echo "Not enabling shell tracing (command contains $1)"
+ $as_echo "$2" >"$at_check_line_file"
+ at_check_trace=: at_check_filter=:
+ : >"$at_stdout"; : >"$at_stderr"
}
-# at_func_filter_trace EXIT-CODE
+# at_fn_check_prepare_trace LINE
# ------------------------------
-# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
-# and the other lines (on file "$at_stderr"). Return the exit code EXIT-CODE.
-at_func_filter_trace ()
+# Perform AT_CHECK preparations for the command at LINE for a traceable
+# command.
+at_fn_check_prepare_trace ()
+{
+ $as_echo "$1" >"$at_check_line_file"
+ at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
+ : >"$at_stdout"; : >"$at_stderr"
+}
+
+# at_fn_check_prepare_dynamic COMMAND LINE
+# ----------------------------------------
+# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
+# preparation function.
+at_fn_check_prepare_dynamic ()
+{
+ case $1 in
+ *$as_nl*)
+ at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
+ *)
+ at_fn_check_prepare_trace "$2" ;;
+ esac
+}
+
+# at_fn_filter_trace
+# ------------------
+# Remove the lines in the file "$at_stderr" generated by "set -x" and print
+# them to stderr.
+at_fn_filter_trace ()
{
+ mv "$at_stderr" "$at_stder1"
grep '^ *+' "$at_stder1" >&2
grep -v '^ *+' "$at_stder1" >"$at_stderr"
- return $1
}
-# at_func_log_failure FILE-LIST
-# -----------------------------
+# at_fn_log_failure FILE-LIST
+# ---------------------------
# Copy the files in the list on stdout with a "> " prefix, and exit the shell
# with a failure exit code.
-at_func_log_failure ()
+at_fn_log_failure ()
{
for file
do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1227,56 +1272,62 @@ at_func_log_failure ()
exit 1
}
-# at_func_check_skip EXIT-CODE
-# ----------------------------
-# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
-# with that same exit code.
-at_func_check_skip ()
+# at_fn_check_skip EXIT-CODE LINE
+# -------------------------------
+# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
+# the test group subshell with that same exit code. Use LINE in any report
+# about test failure.
+at_fn_check_skip ()
{
case $1 in
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$2: hard failure"; exit 99;;
77) echo 77 > "$at_status_file"; exit 77;;
esac
}
-# at_func_check_status EXPECTED EXIT-CODE LINE
-# --------------------------------------------
-# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
-# Otherwise, if it is 77 exit the shell with that same exit code; if it is
-# anything else print an error message and fail the test.
-at_func_check_status ()
+# at_fn_check_status EXPECTED EXIT-CODE LINE
+# ------------------------------------------
+# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
+# Otherwise, if it is 77 or 99, exit the test group subshell with that same
+# exit code; if it is anything else print an error message referring to LINE,
+# and fail the test.
+at_fn_check_status ()
{
case $2 in
$1 ) ;;
77) echo 77 > "$at_status_file"; exit 77;;
+ 99) echo 99 > "$at_status_file"; at_failed=:
+ $as_echo "$3: hard failure"; exit 99;;
*) $as_echo "$3: exit code was $2, expected $1"
at_failed=:;;
esac
}
-# at_func_diff_devnull FILE
-# -------------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless
-# diff invocations.
-at_func_diff_devnull ()
+# at_fn_diff_devnull FILE
+# -----------------------
+# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
+# invocations.
+at_fn_diff_devnull ()
{
test -s "$1" || return 0
$at_diff "$at_devnull" "$1"
}
-# at_func_test NUMBER
-# -------------------
+# at_fn_test NUMBER
+# -----------------
# Parse out test NUMBER from the tail of this file.
-at_func_test ()
+at_fn_test ()
{
eval at_sed=\$at_sed$1
sed "$at_sed" "$at_myself" > "$at_test_source"
}
-# at_func_create_debugging_script
-# -------------------------------
+# at_fn_create_debugging_script
+# -----------------------------
# Create the debugging script $at_group_dir/run which will reproduce the
# current test group.
-at_func_create_debugging_script ()
+at_fn_create_debugging_script ()
{
{
echo "#! /bin/sh" &&
@@ -1288,34 +1339,13 @@ at_func_create_debugging_script ()
chmod +x "$at_group_dir/run"
}
-# at_func_arith
-# -------------
-# Arithmetic evaluation, avoids expr if the shell is sane. The
-# interpretation of leading zeroes is unspecified.
-#
-# subshell and eval are needed to keep Solaris sh from bailing out:
-if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
- # With "$@", bash does not split positional parameters:
- eval 'at_func_arith ()
- {
- at_func_arith_result=$(( $* ))
- }'
-else
- at_func_arith ()
- {
- at_func_arith_result=`expr "$@"`
- }
-fi
-
-## ---------------------- ##
-## End of shell functions ##
-## ---------------------- ##
+## -------------------------------- ##
+## End of autotest shell functions. ##
+## -------------------------------- ##
{
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Tested programs. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
} >&5
@@ -1323,34 +1353,35 @@ _ASBOX
for at_program in : $at_tested
do
test "$at_program" = : && continue
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $at_program in
+ [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
+ * )
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -f "$as_dir/$at_program" && break
-done
+ test -f "$as_dir/$at_program" && break
+ done
IFS=$as_save_IFS
- if test -f "$as_dir/$at_program"; then
+ at_program_=$as_dir/$at_program ;;
+ esac
+ if test -f "$at_program_"; then
{
- $as_echo "$at_srcdir/getdapTest.at:3: $as_dir/$at_program --version"
- "$as_dir/$at_program" --version </dev/null
+ $as_echo "$at_srcdir/getdapTest.at:3: $at_program_ --version"
+ "$at_program_" --version </dev/null
echo
} >&5 2>&1
else
- { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
-$as_echo "$as_me: error: cannot find $at_program" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find $at_program" "$LINENO" 5
fi
done
{
- cat <<\_ASBOX
-## ------------------ ##
+ $as_echo "## ------------------ ##
## Running the tests. ##
-## ------------------ ##
-_ASBOX
+## ------------------ ##"
} >&5
at_start_date=`date`
@@ -1358,11 +1389,8 @@ at_start_time=`date +%s 2>/dev/null`
$as_echo "$as_me: starting at: $at_start_date" >&5
# Create the master directory if it doesn't already exist.
-test -d "$at_suite_dir" ||
- mkdir "$at_suite_dir" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
-$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
- { (exit 1); exit 1; }; }
+as_dir="$at_suite_dir"; as_fn_mkdir_p ||
+ as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
# Can we diff with `/dev/null'? DU 5.0 refuses.
if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1396,28 +1424,40 @@ BEGIN { FS="" }
if (test == "'"$at_group"'") exit
}' "$at_myself" > "$at_suite_dir/at-source-lines" &&
. "$at_suite_dir/at-source-lines" ||
- { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
-$as_echo "$as_me: error: cannot create test line number cache" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot create test line number cache" "$LINENO" 5
rm -f "$at_suite_dir/at-source-lines"
+# Set number of jobs for `-j'; avoid more jobs than test groups.
+set X $at_groups; shift; at_max_jobs=$#
+if test $at_max_jobs -eq 0; then
+ at_jobs=1
+fi
+if test $at_jobs -ne 1 &&
+ { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
+ at_jobs=$at_max_jobs
+fi
+
+# If parallel mode, don't output banners, don't split summary lines.
+if test $at_jobs -ne 1; then
+ at_print_banners=false
+ at_quiet=:
+fi
+
# Set up helper dirs.
rm -rf "$at_helper_dir" &&
mkdir "$at_helper_dir" &&
cd "$at_helper_dir" &&
{ test -z "$at_groups" || mkdir $at_groups; } ||
-{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
-$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
- { (exit 1); exit 1; }; }
+as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
# Functions for running a test group. We leave the actual
# test group execution outside of a shell function in order
# to avoid hitting zsh 4.x exit status bugs.
-# at_func_group_prepare
-# ---------------------
-# Prepare running a test group
-at_func_group_prepare ()
+# at_fn_group_prepare
+# -------------------
+# Prepare for running a test group.
+at_fn_group_prepare ()
{
# The directory for additional per-group helper files.
at_job_dir=$at_helper_dir/$at_group
@@ -1451,56 +1491,20 @@ at_func_group_prepare ()
# Create a fresh directory for the next test group, and enter.
+ # If one already exists, the user may have invoked ./run from
+ # within that directory; we remove the contents, but not the
+ # directory itself, so that we aren't pulling the rug out from
+ # under the shell's notion of the current directory.
at_group_dir=$at_suite_dir/$at_group_normalized
at_group_log=$at_group_dir/$as_me.log
if test -d "$at_group_dir"; then
- find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
- rm -fr "$at_group_dir" ||
- { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
- fi
+ find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
+ rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
+fi ||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
# Be tolerant if the above `rm' was not able to remove the directory.
- { as_dir="$at_group_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$at_group_dir"; as_fn_mkdir_p
echo 0 > "$at_status_file"
@@ -1513,9 +1517,29 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
fi
}
-# at_func_group_postprocess
-# -------------------------
-at_func_group_postprocess ()
+# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
+# -------------------------------------------------
+# Declare the test group ORDINAL, located at LINE with group description DESC,
+# and residing under BANNER. Use PAD to align the status column.
+at_fn_group_banner ()
+{
+ at_setup_line="$2"
+ test -n "$5" && at_fn_banner $5
+ at_desc="$3"
+ case $1 in
+ [0-9]) at_desc_line=" $1: ";;
+ [0-9][0-9]) at_desc_line=" $1: " ;;
+ *) at_desc_line="$1: " ;;
+ esac
+ as_fn_append at_desc_line "$3$4"
+ $at_quiet $as_echo_n "$at_desc_line"
+ echo "# -*- compilation -*-" >> "$at_group_log"
+}
+
+# at_fn_group_postprocess
+# -----------------------
+# Perform cleanup after running a test group.
+at_fn_group_postprocess ()
{
# Be sure to come back to the suite directory, in particular
# since below we might `rm' the group directory we are in currently.
@@ -1528,6 +1552,7 @@ at_func_group_postprocess ()
report this failure to <opendap-tech at opendap.org>.
_ATEOF
$as_echo "$at_setup_line" >"$at_check_line_file"
+ at_status=99
fi
$at_verbose $as_echo_n "$at_group. $at_setup_line: "
$as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1536,31 +1561,41 @@ _ATEOF
at_msg="UNEXPECTED PASS"
at_res=xpass
at_errexit=$at_errexit_p
+ at_color=$at_red
;;
no:0)
at_msg="ok"
at_res=pass
at_errexit=false
+ at_color=$at_grn
;;
*:77)
at_msg='skipped ('`cat "$at_check_line_file"`')'
at_res=skip
at_errexit=false
+ at_color=$at_blu
+ ;;
+ no:* | *:99)
+ at_msg='FAILED ('`cat "$at_check_line_file"`')'
+ at_res=fail
+ at_errexit=$at_errexit_p
+ at_color=$at_red
;;
yes:*)
at_msg='expected failure ('`cat "$at_check_line_file"`')'
at_res=xfail
at_errexit=false
- ;;
- no:*)
- at_msg='FAILED ('`cat "$at_check_line_file"`')'
- at_res=fail
- at_errexit=$at_errexit_p
+ at_color=$at_lgn
;;
esac
echo "$at_res" > "$at_job_dir/$at_res"
- # Make sure there is a separator even with long titles.
- $as_echo " $at_msg"
+ # In parallel mode, output the summary line only afterwards.
+ if test $at_jobs -ne 1 && test -n "$at_verbose"; then
+ $as_echo "$at_desc_line $at_color$at_msg$at_std"
+ else
+ # Make sure there is a separator even with long titles.
+ $as_echo " $at_color$at_msg$at_std"
+ fi
at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
case $at_status in
0|77)
@@ -1575,9 +1610,13 @@ _ATEOF
$as_echo "$at_log_msg" >> "$at_group_log"
$as_echo "$at_log_msg" >&5
- # Cleanup the group directory, unless the user wants the files.
- if $at_debug_p; then
- at_func_create_debugging_script
+ # Cleanup the group directory, unless the user wants the files
+ # or the success was unexpected.
+ if $at_debug_p || test $at_res = xpass; then
+ at_fn_create_debugging_script
+ if test $at_res = xpass && $at_errexit; then
+ echo stop > "$at_stop_file"
+ fi
else
if test -d "$at_group_dir"; then
find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1594,7 +1633,7 @@ _ATEOF
# Upon failure, keep the group directory for autopsy, and create
# the debugging script. With -e, do not start any further tests.
- at_func_create_debugging_script
+ at_fn_create_debugging_script
if $at_errexit; then
echo stop > "$at_stop_file"
fi
@@ -1607,22 +1646,134 @@ _ATEOF
## Driver loop. ##
## ------------ ##
+
+if (set -m && set +m && set +b) >/dev/null 2>&1; then
+ set +b
+ at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
+else
+ at_job_control_on=: at_job_control_off=: at_job_group=
+fi
+
+for at_signal in 1 2 15; do
+ trap 'set +x; set +e
+ $at_job_control_off
+ at_signal='"$at_signal"'
+ echo stop > "$at_stop_file"
+ trap "" $at_signal
+ at_pgids=
+ for at_pgid in `jobs -p 2>/dev/null`; do
+ at_pgids="$at_pgids $at_job_group$at_pgid"
+ done
+ test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
+ wait
+ if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
+ echo >&2
+ fi
+ at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
+ set x $at_signame
+ test 1 -gt 2 && at_signame=$at_signal
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
+$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
+ as_fn_arith 128 + $at_signal && exit_status=$as_val
+ as_fn_exit $exit_status' $at_signal
+done
+
rm -f "$at_stop_file"
at_first=:
-for at_group in $at_groups; do
- at_func_group_prepare
- if cd "$at_group_dir" &&
- at_func_test $at_group &&
- . "$at_test_source"; then :; else
- { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
+if test $at_jobs -ne 1 &&
+ rm -f "$at_job_fifo" &&
+ test -n "$at_job_group" &&
+ ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
+then
+ # FIFO job dispatcher.
+
+ trap 'at_pids=
+ for at_pid in `jobs -p`; do
+ at_pids="$at_pids $at_job_group$at_pid"
+ done
+ if test -n "$at_pids"; then
+ at_sig=TSTP
+ test "${TMOUT+set}" = set && at_sig=STOP
+ kill -$at_sig $at_pids 2>/dev/null
+ fi
+ kill -STOP $$
+ test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
+
+ echo
+ # Turn jobs into a list of numbers, starting from 1.
+ at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
+
+ set X $at_joblist
+ shift
+ for at_group in $at_groups; do
+ $at_job_control_on 2>/dev/null
+ (
+ # Start one test group.
+ $at_job_control_off
+ if $at_first; then
+ exec 7>"$at_job_fifo"
+ else
+ exec 6<&-
+ fi
+ trap 'set +x; set +e
+ trap "" PIPE
+ echo stop > "$at_stop_file"
+ echo >&7
+ as_fn_exit 141' PIPE
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"
+ then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
- at_failed=:
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ echo >&7
+ ) &
+ $at_job_control_off
+ if $at_first; then
+ at_first=false
+ exec 6<"$at_job_fifo" 7>"$at_job_fifo"
+ fi
+ shift # Consume one token.
+ if test $# -gt 0; then :; else
+ read at_token <&6 || break
+ set x $*
+ fi
+ test -f "$at_stop_file" && break
+ done
+ exec 7>&-
+ # Read back the remaining ($at_jobs - 1) tokens.
+ set X $at_joblist
+ shift
+ if test $# -gt 0; then
+ shift
+ for at_job
+ do
+ read at_token
+ done <&6
fi
- at_func_group_postprocess
- test -f "$at_stop_file" && break
- at_first=false
-done
+ exec 6<&-
+ wait
+else
+ # Run serially, avoid forks and other potential surprises.
+ for at_group in $at_groups; do
+ at_fn_group_prepare
+ if cd "$at_group_dir" &&
+ at_fn_test $at_group &&
+ . "$at_test_source"; then :; else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
+ at_failed=:
+ fi
+ at_fn_group_postprocess
+ test -f "$at_stop_file" && break
+ at_first=false
+ done
+fi
# Wrap up the test suite with summary statistics.
cd "$at_helper_dir"
@@ -1643,12 +1794,9 @@ set X $at_xfail_list; shift; at_xfail_count=$#
set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
set X $at_skip_list; shift; at_skip_count=$#
-at_func_arith $at_group_count - $at_skip_count
-at_run_count=$at_func_arith_result
-at_func_arith $at_xpass_count + $at_fail_count
-at_unexpected_count=$at_func_arith_result
-at_func_arith $at_xfail_count + $at_fail_count
-at_total_fail_count=$at_func_arith_result
+as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
+as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
+as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
# Back to the top directory.
cd "$at_dir"
@@ -1660,35 +1808,26 @@ at_stop_time=`date +%s 2>/dev/null`
$as_echo "$as_me: ending at: $at_stop_date" >&5
case $at_start_time,$at_stop_time in
[0-9]*,[0-9]*)
- at_func_arith $at_stop_time - $at_start_time
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_s / 60
- at_duration_m=$at_func_arith_result
- at_func_arith $at_duration_m / 60
- at_duration_h=$at_func_arith_result
- at_func_arith $at_duration_s % 60
- at_duration_s=$at_func_arith_result
- at_func_arith $at_duration_m % 60
- at_duration_m=$at_func_arith_result
+ as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
+ as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
+ as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
+ as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
+ as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
$as_echo "$as_me: test suite duration: $at_duration" >&5
;;
esac
echo
-cat <<\_ASBOX
-## ------------- ##
+$as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
{
echo
- cat <<\_ASBOX
-## ------------- ##
+ $as_echo "## ------------- ##
## Test results. ##
-## ------------- ##
-_ASBOX
+## ------------- ##"
echo
} >&5
@@ -1706,12 +1845,14 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
at_result="$at_result $at_were run, one failed"
fi
at_result="$at_result unexpectedly and inhibited subsequent tests."
+ at_color=$at_red
else
# Don't you just love exponential explosion of the number of cases?
+ at_color=$at_red
case $at_xpass_count:$at_fail_count:$at_xfail_count in
# So far, so good.
- 0:0:0) at_result="$at_result $at_were successful." ;;
- 0:0:*) at_result="$at_result behaved as expected." ;;
+ 0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
+ 0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
# Some unexpected failures
0:*:0) at_result="$at_result $at_were run,
@@ -1757,18 +1898,16 @@ $at_skip_count tests were skipped." ;;
esac
if test $at_unexpected_count = 0; then
- echo "$at_result"
+ echo "$at_color$at_result$at_std"
echo "$at_result" >&5
else
- echo "ERROR: $at_result" >&2
+ echo "${at_color}ERROR: $at_result$at_std" >&2
echo "ERROR: $at_result" >&5
{
echo
- cat <<\_ASBOX
-## ------------------------ ##
+ $as_echo "## ------------------------ ##
## Summary of the failures. ##
-## ------------------------ ##
-_ASBOX
+## ------------------------ ##"
# Summary of failed and skipped tests.
if test $at_fail_count != 0; then
@@ -1787,11 +1926,9 @@ _ASBOX
echo
fi
if test $at_fail_count != 0; then
- cat <<\_ASBOX
-## ---------------------- ##
+ $as_echo "## ---------------------- ##
## Detailed failed tests. ##
-## ---------------------- ##
-_ASBOX
+## ---------------------- ##"
echo
for at_group in $at_fail_list
do
@@ -1823,19 +1960,21 @@ _ASBOX
_ASBOX
echo
- $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
+ if $at_debug_p; then
+ at_msg='per-test log files'
+ else
+ at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
+ fi
+ $as_echo "Please send $at_msg and all information you think might help:
To: <opendap-tech at opendap.org>
- Subject: [libdap 3.18.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [libdap 3.19.0] $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
+be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
"
- if test $at_debug_p = false; then
- echo
- echo 'You may investigate any problem if you feel able to do so, in which'
- echo 'case the test suite provides a good starting point. Its output may'
- $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
- echo
- fi
- exit 1
+ exit 1
fi
exit 0
@@ -1844,15 +1983,12 @@ exit 0
## Actual tests. ##
## ------------- ##
#AT_START_1
-# 1. getdapTest.at:34: getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc getdap-testsuite/fnoc1.nc.dds (pass)
-at_setup_line='getdapTest.at:34'
-at_desc="getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc getdap-testsuite/fnoc1.nc.dds (pass)"
-$at_quiet $as_echo_n " 1: $at_desc"
+at_fn_group_banner 1 'getdapTest.at:34' \
+ "getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc getdap-testsuite/fnoc1.nc.dds (pass)" ""
at_xfail=no
test "pass" = "xfail" && at_xfail=yes
-echo "# -*- compilation -*-" >> "$at_group_log"
(
- $as_echo "1. getdapTest.at:34: testing ..."
+ $as_echo "1. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -1864,49 +2000,35 @@ echo "# -*- compilation -*-" >> "$at_group_log"
# successful runs are sent to stdout while the errors are sent to
# stderr.
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/getdapTest.at:34: \$abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true"
-echo getdapTest.at:34 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "$abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true"; then
- ( $at_traceon; $abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; $abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
+at_fn_check_prepare_dynamic "$abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true" "getdapTest.at:34"
+( $at_check_trace; $abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || 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_func_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
+$at_failed && at_fn_log_failure
$at_traceon; }
- { $at_traceoff
+ { set +x
$as_echo "$at_srcdir/getdapTest.at:34: diff -b -B \$abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B \$abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr"
-echo getdapTest.at:34 >"$at_check_line_file"
-
-if test -n "$at_traceon" \
- && at_func_check_newline "diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr"; then
- ( $at_traceon; diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr ) >"$at_stdout" 2>"$at_stder1"
- at_func_filter_trace $?
-else
- ( :; diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr ) >"$at_stdout" 2>"$at_stderr"
-fi
-at_status=$?
-at_failed=false
-at_func_diff_devnull "$at_stderr" || at_failed=:
+at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr" "getdapTest.at:34"
+( $at_check_trace; diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds 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_func_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
-
-$at_failed && at_func_log_failure
+at_fn_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
+$at_failed && at_fn_log_failure
$at_traceon; }
- $at_traceoff
+ set +x
$at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 | eval $at_tee_pipe
-at_status=`cat "$at_status_file"`
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
#AT_STOP_1
diff --git a/tests/package.m4 b/tests/package.m4
index dead707..ef22c2b 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -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.18.3])
-m4_define([AT_PACKAGE_STRING], [libdap 3.18.3])
+m4_define([AT_PACKAGE_VERSION], [3.19.0])
+m4_define([AT_PACKAGE_STRING], [libdap 3.19.0])
m4_define([AT_PACKAGE_BUGREPORT], [opendap-tech at opendap.org])
diff --git a/unit-tests/ArrayTest.cc b/unit-tests/ArrayTest.cc
index 51d0426..4cc43df 100644
--- a/unit-tests/ArrayTest.cc
+++ b/unit-tests/ArrayTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -22,7 +21,7 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
-
+
#include <cppunit/TextTestRunner.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/extensions/HelperMacros.h>
@@ -38,51 +37,57 @@
#include "Structure.h"
#include "debug.h"
+#include "GetOpt.h"
using namespace CppUnit;
using namespace std;
-namespace libdap
-{
+static bool debug = false;
+
+namespace libdap {
-class ArrayTest : public TestFixture {
+class ArrayTest: public TestFixture {
private:
Array *d_cardinal, *d_string, *d_structure;
Int16 *d_int16;
Str *d_str;
Structure *d_struct;
-
+
string svalues[4];
public:
- ArrayTest() {
+ ArrayTest()
+ {
svalues[0] = "0 String";
svalues[1] = "1 String";
svalues[2] = "2 String";
svalues[3] = "3 String";
}
-
- ~ArrayTest() {}
- void setUp() {
+ ~ArrayTest()
+ {
+ }
+
+ void setUp()
+ {
d_int16 = new Int16("Int16");
DBG(cerr << "d_int16: " << d_int16 << endl);
d_cardinal = new Array("Array_of_Int16", d_int16);
d_cardinal->append_dim(4, "dimension");
- dods_int16 buffer[4] = {0, 1, 2, 3};
+ dods_int16 buffer[4] = { 0, 1, 2, 3 };
d_cardinal->val2buf(buffer);
#ifdef DODS_DEBUG
for (int i = 0; i < 4; ++i)
- cerr << "buffer[" << i << "]: " << buffer[i] << endl;
+ cerr << "buffer[" << i << "]: " << buffer[i] << endl;
#endif
d_str = new Str("Str");
d_string = new Array("Array_of_String", d_str);
d_string->append_dim(4, "dimension");
- string sbuffer[4] = {"0 String", "1 String", "2 String", "3 String"};
+ string sbuffer[4] = { "0 String", "1 String", "2 String", "3 String" };
d_string->val2buf(sbuffer);
#ifdef DODS_DEBUG
for (int i = 0; i < 4; ++i)
- cerr << "sbuffer[" << i << "]: " << sbuffer[i] << endl;
+ cerr << "sbuffer[" << i << "]: " << sbuffer[i] << endl;
#endif
d_struct = new Structure("Structure");
@@ -91,44 +96,54 @@ public:
d_structure->append_dim(4, "dimension");
ostringstream oss;
for (int i = 0; i < 4; ++i) {
- oss.str(""); oss << "field" << i;
+ oss.str("");
+ oss << "field" << i;
Int16 *n = new Int16(oss.str());
DBG(cerr << "n " << i << ": " << n << endl);
- oss.str(""); oss << "element" << i;
+ oss.str("");
+ oss << "element" << i;
Structure *s = new Structure(oss.str());
s->add_var(n);
d_structure->set_vec(i, s);
- delete n; n = 0;
- delete s; s = 0;
+ delete n;
+ n = 0;
+ delete s;
+ s = 0;
}
- delete d_int16; d_int16 = 0;
- delete d_str; d_str = 0;
- delete d_struct; d_struct = 0;
- }
+ delete d_int16;
+ d_int16 = 0;
+ delete d_str;
+ d_str = 0;
+ delete d_struct;
+ d_struct = 0;
+ }
- void tearDown() {
+ void tearDown()
+ {
delete d_cardinal;
delete d_string;
delete d_structure;
}
- bool re_match(Regex &r, const char *s) {
+ bool re_match(Regex &r, const char *s)
+ {
int match_position = r.match(s, strlen(s));
- DBG(cerr << "match position: " << match_position
- << " string length: " << (int)strlen(s) << endl);
- return match_position == (int)strlen(s);
+ DBG(cerr << "match position: " << match_position
+ << " string length: " << (int)strlen(s) << endl);
+ return match_position == (int) strlen(s);
}
- CPPUNIT_TEST_SUITE( ArrayTest );
+ CPPUNIT_TEST_SUITE (ArrayTest);
- CPPUNIT_TEST(duplicate_cardinal_test);
- CPPUNIT_TEST(duplicate_string_test);
- CPPUNIT_TEST(duplicate_structure_test);
+ CPPUNIT_TEST (duplicate_cardinal_test);
+ CPPUNIT_TEST (duplicate_string_test);
+ CPPUNIT_TEST (duplicate_structure_test);
CPPUNIT_TEST_SUITE_END();
-
- void duplicate_structure_test() {
+
+ void duplicate_structure_test()
+ {
Array::Dim_iter i = d_structure->dim_begin();
CPPUNIT_ASSERT(d_structure->dimension_size(i) == 4);
#ifdef DODS_DEBUG
@@ -136,7 +151,7 @@ public:
Structure *s = dynamic_cast<Structure*>(d_structure->var(i));
DBG(cerr << "s: " << s << endl);
if (s)
- s->print_decl(cerr);
+ s->print_decl(cerr);
}
#endif
@@ -151,82 +166,122 @@ public:
Structure *src = dynamic_cast<Structure*>(d_structure->var(i));
Structure *dest = dynamic_cast<Structure*>(a->var(i));
CPPUNIT_ASSERT(src != dest);
-
+
// However, for the deep copy to be correct, the two arrays must
// have equivalent elements. We know there's only one field...
- CPPUNIT_ASSERT(src->type() == dods_structure_c
- && dest->type() == dods_structure_c);
+ CPPUNIT_ASSERT(src->type() == dods_structure_c && dest->type() == dods_structure_c);
Constructor::Vars_iter s = src->var_begin();
Constructor::Vars_iter d = dest->var_begin();
- CPPUNIT_ASSERT((*s)->type() == dods_int16_c
- && (*d)->type() == dods_int16_c);
+ CPPUNIT_ASSERT((*s)->type() == dods_int16_c && (*d)->type() == dods_int16_c);
CPPUNIT_ASSERT((*s)->name() == (*d)->name());
}
- delete a; a = 0;
+ delete a;
+ a = 0;
}
-
- void duplicate_string_test() {
+
+ void duplicate_string_test()
+ {
Array::Dim_iter i = d_string->dim_begin();
CPPUNIT_ASSERT(d_string->dimension_size(i) == 4);
string *s = new string[4];
- d_string->buf2val((void**)&s);
+ d_string->buf2val((void**) &s);
for (int i = 0; i < 4; ++i) {
- CPPUNIT_ASSERT(s[i] == svalues[i] );
+ CPPUNIT_ASSERT(s[i] == svalues[i]);
DBG(cerr << "s[" << i << "]: " << s[i] << endl);
}
-
+
Array a = *d_string;
i = a.dim_begin();
CPPUNIT_ASSERT(a.dimension_size(i) == 4);
-
+
string *s2 = new string[4];
- d_string->buf2val((void**)&s2);
+ d_string->buf2val((void**) &s2);
for (int i = 0; i < 4; ++i) {
CPPUNIT_ASSERT(s2[i] == svalues[i]);
DBG(cerr << "s2[" << i << "]: " << s2[i] << endl);
}
-
- delete[] s; s = 0;
- delete[] s2; s2 = 0;
+
+ delete[] s;
+ s = 0;
+ delete[] s2;
+ s2 = 0;
}
-
- void duplicate_cardinal_test() {
+
+ void duplicate_cardinal_test()
+ {
Array::Dim_iter i = d_cardinal->dim_begin();
CPPUNIT_ASSERT(d_cardinal->dimension_size(i) == 4);
dods_int16 *b = new dods_int16[4];
- d_cardinal->buf2val((void**)&b);
+ d_cardinal->buf2val((void**) &b);
for (int i = 0; i < 4; ++i) {
CPPUNIT_ASSERT(b[i] == i);
DBG(cerr << "b[" << i << "]: " << b[i] << endl);
}
- delete[] b; b = 0;
-
+ delete[] b;
+ b = 0;
+
Array a = *d_cardinal;
i = a.dim_begin();
CPPUNIT_ASSERT(a.dimension_size(i) == 4);
-
+
dods_int16 *b2 = new dods_int16[4];
- d_cardinal->buf2val((void**)&b2);
+ d_cardinal->buf2val((void**) &b2);
for (int i = 0; i < 4; ++i) {
CPPUNIT_ASSERT(b2[i] == i);
DBG(cerr << "b2[" << i << "]: " << b2[i] << endl);
}
- delete[] b2; b2 = 0;
+ delete[] b2;
+ b2 = 0;
}
-
+
};
-CPPUNIT_TEST_SUITE_REGISTRATION(ArrayTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (ArrayTest);
} // namespace libdap
-int
-main( int, char** )
+int main(int argc, char *argv[])
{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: ArrayTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::ArrayTest::suite()->getTests();
+ unsigned int prefix_len = libdap::ArrayTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
CppUnit::TextTestRunner runner;
- runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- bool wasSuccessful = runner.run( "", false ) ;
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::ArrayTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/AttrTableTest.cc b/unit-tests/AttrTableTest.cc
index 5c2f997..9d9b7ab 100644
--- a/unit-tests/AttrTableTest.cc
+++ b/unit-tests/AttrTableTest.cc
@@ -65,367 +65,397 @@ static string build_fqn(AttrTable *at, string fqn)
namespace libdap {
class AttrTableTest: public TestFixture {
- private:
- AttrTable *at1;
- AttrTable *cont_a, *cont_b, *cont_c, *cont_ba, *cont_ca, *cont_caa;
+private:
+ AttrTable *at1;
+ AttrTable *cont_a, *cont_b, *cont_c, *cont_ba, *cont_ca, *cont_caa;
- public:
- AttrTableTest()
- {
- }
- ~AttrTableTest()
- {
- }
+public:
+ AttrTableTest()
+ {
+ }
+ ~AttrTableTest()
+ {
+ }
- void setUp()
- {
- at1 = new AttrTable;
- cont_a = at1->append_container("a");
- cont_a->append_attr("size", "Int32", "7");
- cont_a->append_attr("type", "String", "cars");
-
- cont_b = at1->append_container("b");
- cont_b->append_attr("number", "Int32", "1");
- cont_b->append_attr("type", "String", "houses");
- cont_ba = cont_b->append_container("ba");
- cont_ba->append_attr("name", "String", "fred");
-
- cont_c = at1->append_container("c");
- cont_ca = cont_c->append_container("ca");
- cont_caa = cont_ca->append_container("caa");
- cont_caa->append_attr("color", "String", "red");
-
- // This AttrTable looks like:
- // Attributes {
- // a {
- // Int32 size 7;
- // String type cars;
- // }
- // b {
- // Int32 number 1;
- // String type houses;
- // ba {
- // String name fred;
- // }
- // }
- // c {
- // ca {
- // caa {
- // String color red;
- // }
- // }
- // }
- // }
- }
+ void setUp()
+ {
+ at1 = new AttrTable;
+ cont_a = at1->append_container("a");
+ cont_a->append_attr("size", "Int32", "7");
+ cont_a->append_attr("type", "String", "cars");
+
+ cont_b = at1->append_container("b");
+ cont_b->append_attr("number", "Int32", "1");
+ cont_b->append_attr("type", "String", "houses");
+ cont_ba = cont_b->append_container("ba");
+ cont_ba->append_attr("name", "String", "fred");
+
+ cont_c = at1->append_container("c");
+ cont_ca = cont_c->append_container("ca");
+ cont_caa = cont_ca->append_container("caa");
+ cont_caa->append_attr("color", "String", "red");
+
+ // This AttrTable looks like:
+ // Attributes {
+ // a {
+ // Int32 size 7;
+ // String type cars;
+ // }
+ // b {
+ // Int32 number 1;
+ // String type houses;
+ // ba {
+ // String name fred;
+ // }
+ // }
+ // c {
+ // ca {
+ // caa {
+ // String color red;
+ // }
+ // }
+ // }
+ // }
+ }
- void tearDown()
- {
- delete at1;
- at1 = 0;
- }
+ void tearDown()
+ {
+ delete at1;
+ at1 = 0;
+ }
- bool re_match(Regex &r, const char *s)
- {
- return r.match(s, strlen(s)) == (int) strlen(s);
- }
+ bool re_match(Regex &r, const char *s)
+ {
+ return r.match(s, strlen(s)) == (int) strlen(s);
+ }
- CPPUNIT_TEST_SUITE( AttrTableTest );
+ CPPUNIT_TEST_SUITE (AttrTableTest);
#if 1
- CPPUNIT_TEST(clone_test);
- CPPUNIT_TEST(find_container_test);
- CPPUNIT_TEST(get_parent_test);
- CPPUNIT_TEST(recurrsive_find_test);
- CPPUNIT_TEST(find_test);
- CPPUNIT_TEST(copy_ctor);
- CPPUNIT_TEST(assignment);
- CPPUNIT_TEST(erase_test);
- CPPUNIT_TEST(names_with_spaces_test);
+ CPPUNIT_TEST (clone_test);
+ CPPUNIT_TEST (find_container_test);
+ CPPUNIT_TEST (get_parent_test);
+ CPPUNIT_TEST (recurrsive_find_test);
+ CPPUNIT_TEST (find_test);
+ CPPUNIT_TEST (copy_ctor);
+ CPPUNIT_TEST (assignment);
+ CPPUNIT_TEST (erase_test);
+ CPPUNIT_TEST (names_with_spaces_test);
#endif
- CPPUNIT_TEST(containers_with_spaces_test);
+ CPPUNIT_TEST (containers_with_spaces_test);
#if 1
- CPPUNIT_TEST(get_attr_iter_test);
- CPPUNIT_TEST(del_attr_table_test);
- CPPUNIT_TEST(append_attr_vector_test);
+ CPPUNIT_TEST (get_attr_iter_test);
+ CPPUNIT_TEST (del_attr_table_test);
+ CPPUNIT_TEST (append_attr_vector_test);
#endif
#if 0
- CPPUNIT_TEST(print_xml_test);
+ CPPUNIT_TEST(print_xml_test);
#endif
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
- // Tests for methods
+ // Tests for methods
- // This is to test for leaks in the clone() method.
- void clone_test() {
- AttrTable *att = new AttrTable;
- att->append_container(new AttrTable(*cont_a), "copy_of_a");
- delete att;
- }
+ // This is to test for leaks in the clone() method.
+ void clone_test()
+ {
+ AttrTable *att = new AttrTable;
+ att->append_container(new AttrTable(*cont_a), "copy_of_a");
+ delete att;
+ }
- void recurrsive_find_test() {
- AttrTable::Attr_iter location;
- AttrTable *a = at1->recurrsive_find("color", &location);
- CPPUNIT_ASSERT(a && a == cont_caa && a->get_name(location) == "color");
+ void recurrsive_find_test()
+ {
+ AttrTable::Attr_iter location;
+ AttrTable *a = at1->recurrsive_find("color", &location);
+ CPPUNIT_ASSERT(a && a == cont_caa && a->get_name(location) == "color");
- a = cont_caa->recurrsive_find("color", &location);
- CPPUNIT_ASSERT(a && a == cont_caa && a->get_name(location) == "color");
+ a = cont_caa->recurrsive_find("color", &location);
+ CPPUNIT_ASSERT(a && a == cont_caa && a->get_name(location) == "color");
- a = at1->recurrsive_find("ba", &location);
- CPPUNIT_ASSERT(a && a == cont_b && a->get_name(location) == "ba");
- }
+ a = at1->recurrsive_find("ba", &location);
+ CPPUNIT_ASSERT(a && a == cont_b && a->get_name(location) == "ba");
+ }
- void get_parent_test() {
- CPPUNIT_ASSERT(cont_caa->get_parent() == cont_ca);
- CPPUNIT_ASSERT(cont_ca->get_parent() == cont_c);
- CPPUNIT_ASSERT(cont_c->get_parent() == at1);
- CPPUNIT_ASSERT(at1->get_parent() == 0);
- CPPUNIT_ASSERT(build_fqn(cont_caa, "color") == "c.ca.caa.color");
- }
+ void get_parent_test()
+ {
+ CPPUNIT_ASSERT(cont_caa->get_parent() == cont_ca);
+ CPPUNIT_ASSERT(cont_ca->get_parent() == cont_c);
+ CPPUNIT_ASSERT(cont_c->get_parent() == at1);
+ CPPUNIT_ASSERT(at1->get_parent() == 0);
+ CPPUNIT_ASSERT(build_fqn(cont_caa, "color") == "c.ca.caa.color");
+ }
- void find_container_test() {
- AttrTable *tmp = at1->find_container("a");
- CPPUNIT_ASSERT(tmp != 0);
- CPPUNIT_ASSERT(tmp == cont_a);
+ void find_container_test()
+ {
+ AttrTable *tmp = at1->find_container("a");
+ CPPUNIT_ASSERT(tmp != 0);
+ CPPUNIT_ASSERT(tmp == cont_a);
- CPPUNIT_ASSERT(at1->find_container("b.ba") == cont_ba);
- CPPUNIT_ASSERT(at1->find_container("a.b") == 0);
- CPPUNIT_ASSERT(at1->find_container("c.ca.caa") == cont_caa);
- CPPUNIT_ASSERT(at1->find_container("caa") == 0);
+ CPPUNIT_ASSERT(at1->find_container("b.ba") == cont_ba);
+ CPPUNIT_ASSERT(at1->find_container("a.b") == 0);
+ CPPUNIT_ASSERT(at1->find_container("c.ca.caa") == cont_caa);
+ CPPUNIT_ASSERT(at1->find_container("caa") == 0);
- CPPUNIT_ASSERT(at1->find_container("a.size") == 0);
- CPPUNIT_ASSERT(at1->find_container("b.ba.name") == 0);
- }
+ CPPUNIT_ASSERT(at1->find_container("a.size") == 0);
+ CPPUNIT_ASSERT(at1->find_container("b.ba.name") == 0);
+ }
- void find_test() {
- AttrTable *tmp;
- AttrTable::Attr_iter iter;
- at1->find("a", &tmp, &iter);
- CPPUNIT_ASSERT(tmp && iter != tmp->attr_end() && tmp->is_container(iter)
- && tmp->get_name(iter) == "a");
- at1->find("a.size", &tmp, &iter);
- CPPUNIT_ASSERT(tmp && iter != tmp->attr_end() && !tmp->is_container(iter)
- && tmp->get_name(iter) == "size" && tmp->get_attr(iter) == "7");
- at1->find("b.type", &tmp, &iter);
- CPPUNIT_ASSERT(tmp && iter != tmp->attr_end() && !tmp->is_container(iter)
- && tmp->get_name(iter) == "type"
- && tmp->get_attr(iter) == "houses");
- at1->find("c.ca.caa.color", &tmp, &iter);
- CPPUNIT_ASSERT(tmp && iter != tmp->attr_end() && !tmp->is_container(iter)
- && tmp->get_name(iter) == "color"
- && tmp->get_attr(iter) == "red");
- at1->find("d.size", &tmp, &iter);
- CPPUNIT_ASSERT(!tmp);
- at1->find("c.size", &tmp, &iter);
- CPPUNIT_ASSERT(tmp == cont_c && iter == tmp->attr_end());
- }
+ void find_test()
+ {
+ AttrTable *tmp;
+ AttrTable::Attr_iter iter;
+ at1->find("a", &tmp, &iter);
+ CPPUNIT_ASSERT(tmp && iter != tmp->attr_end() && tmp->is_container(iter) && tmp->get_name(iter) == "a");
+ at1->find("a.size", &tmp, &iter);
+ CPPUNIT_ASSERT(
+ tmp && iter != tmp->attr_end() && !tmp->is_container(iter) && tmp->get_name(iter) == "size"
+ && tmp->get_attr(iter) == "7");
+ at1->find("b.type", &tmp, &iter);
+ CPPUNIT_ASSERT(
+ tmp && iter != tmp->attr_end() && !tmp->is_container(iter) && tmp->get_name(iter) == "type"
+ && tmp->get_attr(iter) == "houses");
+ at1->find("c.ca.caa.color", &tmp, &iter);
+ CPPUNIT_ASSERT(
+ tmp && iter != tmp->attr_end() && !tmp->is_container(iter) && tmp->get_name(iter) == "color"
+ && tmp->get_attr(iter) == "red");
+ at1->find("d.size", &tmp, &iter);
+ CPPUNIT_ASSERT(!tmp);
+ at1->find("c.size", &tmp, &iter);
+ CPPUNIT_ASSERT(tmp == cont_c && iter == tmp->attr_end());
+ }
- void copy_ctor() {
- AttrTable at2 = *at1;
- AttrTable::Attr_iter piter = at2.attr_begin();
- CPPUNIT_ASSERT(at2.get_name(piter) == "a");
- CPPUNIT_ASSERT(at2.is_container(piter));
- AttrTable *tmp = at2.get_attr_table(piter);
- AttrTable::Attr_iter qiter = tmp->attr_begin();
- CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
- piter++;
- CPPUNIT_ASSERT(at2.get_name(piter) == "b");
- CPPUNIT_ASSERT(at2.is_container(piter));
- piter++;
- CPPUNIT_ASSERT(at2.get_name(piter) == "c");
- CPPUNIT_ASSERT(at2.is_container(piter));
- }
+ void copy_ctor()
+ {
+ AttrTable at2 = *at1;
+ AttrTable::Attr_iter piter = at2.attr_begin();
+ CPPUNIT_ASSERT(at2.get_name(piter) == "a");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+ AttrTable *tmp = at2.get_attr_table(piter);
+ AttrTable::Attr_iter qiter = tmp->attr_begin();
+ CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
+ piter++;
+ CPPUNIT_ASSERT(at2.get_name(piter) == "b");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+ piter++;
+ CPPUNIT_ASSERT(at2.get_name(piter) == "c");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+ }
- void assignment() {
- AttrTable at2;
- at2 = *at1;
-
- AttrTable::Attr_iter piter = at2.attr_begin();
- CPPUNIT_ASSERT(at2.get_name(piter) == "a");
- CPPUNIT_ASSERT(at2.is_container(piter));
- AttrTable *tmp = at2.get_attr_table(piter);
- AttrTable::Attr_iter qiter = tmp->attr_begin();
- CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
- piter++;
- CPPUNIT_ASSERT(at2.get_name(piter) == "b");
- CPPUNIT_ASSERT(at2.is_container(piter));
- piter++;
- CPPUNIT_ASSERT(at2.get_name(piter) == "c");
- CPPUNIT_ASSERT(at2.is_container(piter));
- }
+ void assignment()
+ {
+ AttrTable at2;
+ at2 = *at1;
+
+ AttrTable::Attr_iter piter = at2.attr_begin();
+ CPPUNIT_ASSERT(at2.get_name(piter) == "a");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+ AttrTable *tmp = at2.get_attr_table(piter);
+ AttrTable::Attr_iter qiter = tmp->attr_begin();
+ CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
+ piter++;
+ CPPUNIT_ASSERT(at2.get_name(piter) == "b");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+ piter++;
+ CPPUNIT_ASSERT(at2.get_name(piter) == "c");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+ }
- void erase_test() {
- // Copy at1 to at2 and verify that at2 is full of stuff...
- AttrTable at2 = *at1;
- AttrTable::Attr_iter piter = at2.attr_begin();
- CPPUNIT_ASSERT(at2.get_name(piter) == "a");
- CPPUNIT_ASSERT(at2.is_container(piter));
- AttrTable *tmp = at2.get_attr_table(piter);
- AttrTable::Attr_iter qiter = tmp->attr_begin();
- CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
- piter++;
- CPPUNIT_ASSERT(at2.get_name(piter) == "b");
- CPPUNIT_ASSERT(at2.is_container(piter));
- piter++;
- CPPUNIT_ASSERT(at2.get_name(piter) == "c");
- CPPUNIT_ASSERT(at2.is_container(piter));
-
- at2.erase();
- CPPUNIT_ASSERT(at2.attr_map.size() == 0);
- CPPUNIT_ASSERT(at2.d_name == "");
- }
+ void erase_test()
+ {
+ // Copy at1 to at2 and verify that at2 is full of stuff...
+ AttrTable at2 = *at1;
+ AttrTable::Attr_iter piter = at2.attr_begin();
+ CPPUNIT_ASSERT(at2.get_name(piter) == "a");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+ AttrTable *tmp = at2.get_attr_table(piter);
+ AttrTable::Attr_iter qiter = tmp->attr_begin();
+ CPPUNIT_ASSERT(tmp->get_name(qiter) == "size");
+ piter++;
+ CPPUNIT_ASSERT(at2.get_name(piter) == "b");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+ piter++;
+ CPPUNIT_ASSERT(at2.get_name(piter) == "c");
+ CPPUNIT_ASSERT(at2.is_container(piter));
+
+ at2.erase();
+ CPPUNIT_ASSERT(at2.attr_map.size() == 0);
+ CPPUNIT_ASSERT(at2.d_name == "");
+ }
- void names_with_spaces_test() {
- // Create an AttrTable where some names have spaces. The spaces
- // should be replaced by %20 escapes.
- // Replacing the spaces with %20 was the bad, old, behavior. Now
- // the spaces can stay. If someone is writing a DAS using the {}
- // notation, they can use '%20' for the spaces. In the printed
- // DAS using the {} notation, spaces will be represented by %20.
- AttrTable *t = new AttrTable;
- t->append_attr("long name", "String", "first");
- t->append_attr("longer name", "String", "\"second test\"");
- //string sof;
- ostringstream oss;
- t->print(oss, "");
- //FILE2string(sof, of, t->print(of, ""));
- string attrs = "String long%20name \"first\";\n\
+ void names_with_spaces_test()
+ {
+ // Create an AttrTable where some names have spaces. The spaces
+ // should be replaced by %20 escapes.
+ // Replacing the spaces with %20 was the bad, old, behavior. Now
+ // the spaces can stay. If someone is writing a DAS using the {}
+ // notation, they can use '%20' for the spaces. In the printed
+ // DAS using the {} notation, spaces will be represented by %20.
+ AttrTable *t = new AttrTable;
+ t->append_attr("long name", "String", "first");
+ t->append_attr("longer name", "String", "\"second test\"");
+ //string sof;
+ ostringstream oss;
+ t->print(oss, "");
+ //FILE2string(sof, of, t->print(of, ""));
+ string attrs = "String long%20name \"first\";\n\
String longer%20name \"second test\";";
- //CPPUNIT_ASSERT(sof.find(attrs) != string::npos);
- CPPUNIT_ASSERT(oss.str().find(attrs) != string::npos);
- delete t; t = 0;
- }
+ //CPPUNIT_ASSERT(sof.find(attrs) != string::npos);
+ CPPUNIT_ASSERT(oss.str().find(attrs) != string::npos);
+ delete t;
+ t = 0;
+ }
- void containers_with_spaces_test() {
- AttrTable *top = new AttrTable;
- try {
- AttrTable *cont = top->append_container("Data Field");
- cont->append_attr("long name", "String", "first");
- cont->add_value_alias(top, "an alias", "long name");
- }
- catch (Error &e) {
- cerr << e.get_error_message() << endl;
- CPPUNIT_ASSERT("Caught Error exception!" && false);
- }
- try {
- ostringstream oss;
- top->print(oss);
- Regex r(".*Data%20Field \\{\n\
+ void containers_with_spaces_test()
+ {
+ AttrTable *top = new AttrTable;
+ try {
+ AttrTable *cont = top->append_container("Data Field");
+ cont->append_attr("long name", "String", "first");
+ cont->add_value_alias(top, "an alias", "long name");
+ }
+ catch (Error &e) {
+ cerr << e.get_error_message() << endl;
+ CPPUNIT_ASSERT("Caught Error exception!" && false);
+ }
+ try {
+ ostringstream oss;
+ top->print(oss);
+ Regex r(
+ ".*Data%20Field \\{\n\
.*String long%20name \"first\";\n\
.*Alias an%20alias long%20name;\n\
.*\\}\n");
- DBG(cout << ">" << oss.str() << "<" << endl);
- CPPUNIT_ASSERT(re_match(r, oss.str().c_str()));
- delete top; top = 0;
- }
- catch (Error &e) {
- cerr << e.get_error_message() << endl;
- CPPUNIT_ASSERT("Caught Error exception!" && false);
- }
+ DBG(cout << ">" << oss.str() << "<" << endl);
+ CPPUNIT_ASSERT(re_match(r, oss.str().c_str()));
+ delete top;
+ top = 0;
}
-
- void get_attr_iter_test() {
- int n = at1->get_size();
- CPPUNIT_ASSERT(n == 3);
-
- AttrTable::Attr_iter i = at1->get_attr_iter(0);
- CPPUNIT_ASSERT(at1->get_name(i) == "a");
- i = at1->get_attr_iter(2);
- CPPUNIT_ASSERT(at1->get_name(i) == "c");
-
- i = at1->get_attr_iter(1);
- CPPUNIT_ASSERT(at1->is_container(i));
- AttrTable *t1 = at1->get_attr_table(i);
- AttrTable::Attr_iter k = t1->get_attr_iter(1);
- CPPUNIT_ASSERT(t1->get_name(k) == "type");
- CPPUNIT_ASSERT(t1->get_attr(k, 0) == "houses");
+ catch (Error &e) {
+ cerr << e.get_error_message() << endl;
+ CPPUNIT_ASSERT("Caught Error exception!" && false);
}
+ }
- void del_attr_table_test() {
- AttrTable *b = at1->find_container("b");
- AttrTable::Attr_iter i = b->attr_begin();
- CPPUNIT_ASSERT(b->get_name(i) == "number");
- i += 2;
- CPPUNIT_ASSERT(b->get_name(i) == "ba");
-
- b->del_attr_table(i);
-
- i = b->attr_begin();
- CPPUNIT_ASSERT(b->get_name(i) == "number");
- i += 2;
- CPPUNIT_ASSERT(i == b->attr_end());
-
- // try a second table. at2 contains a scalar attribute followed by a
- // container named 'a'.
- AttrTable *at2;
- try {
- at2 = new AttrTable;
- at2->set_name("at2");
- at2->append_attr("color", "String", "red");
- AttrTable *cont_at2 = at2->append_container("cont_at2");
- cont_at2->append_attr("size", "Int32", "7");
- cont_at2->append_attr("type", "String", "cars");
- i = at2->attr_begin();
- CPPUNIT_ASSERT(at2->get_name(i) == "color");
- i++ ;
- CPPUNIT_ASSERT(at2->get_name(i) == "cont_at2");
-
- at2->del_attr_table(i);
-
- i = at2->attr_begin();
- CPPUNIT_ASSERT(at2->get_name(i) == "color");
- i++ ;
- CPPUNIT_ASSERT(i == at2->attr_end());
-
- delete at2; at2 = 0;
- }
- catch (Error &e) {
- cerr << "Error: " << e.get_error_message() << endl;
- delete at2; at2 = 0;
- throw;
- }
- catch (...) {
- cerr << "caught an exception!" << endl;
- delete at2; at2 = 0;
- throw;
- }
- }
+ void get_attr_iter_test()
+ {
+ int n = at1->get_size();
+ CPPUNIT_ASSERT(n == 3);
+
+ AttrTable::Attr_iter i = at1->get_attr_iter(0);
+ CPPUNIT_ASSERT(at1->get_name(i) == "a");
+ i = at1->get_attr_iter(2);
+ CPPUNIT_ASSERT(at1->get_name(i) == "c");
+
+ i = at1->get_attr_iter(1);
+ CPPUNIT_ASSERT(at1->is_container(i));
+ AttrTable *t1 = at1->get_attr_table(i);
+ AttrTable::Attr_iter k = t1->get_attr_iter(1);
+ CPPUNIT_ASSERT(t1->get_name(k) == "type");
+ CPPUNIT_ASSERT(t1->get_attr(k, 0) == "houses");
+ }
- void append_attr_vector_test() {
- // ("size", "Int32", "7")
- vector<string> vs;
- vs.push_back("8");
- vs.push_back("9");
- cont_a->append_attr("size", "Int32", &vs);
-
- CPPUNIT_ASSERT(cont_a->get_attr("size", 0) == "7");
- CPPUNIT_ASSERT(cont_a->get_attr("size", 1) == "8");
- CPPUNIT_ASSERT(cont_a->get_attr("size", 2) == "9");
- CPPUNIT_ASSERT(cont_a->get_attr_num("size") == 3);
+ void del_attr_table_test()
+ {
+ AttrTable *b = at1->find_container("b");
+ AttrTable::Attr_iter i = b->attr_begin();
+ CPPUNIT_ASSERT(b->get_name(i) == "number");
+ i += 2;
+ CPPUNIT_ASSERT(b->get_name(i) == "ba");
+
+ b->del_attr_table(i);
+
+ i = b->attr_begin();
+ CPPUNIT_ASSERT(b->get_name(i) == "number");
+ i += 2;
+ CPPUNIT_ASSERT(i == b->attr_end());
+
+ // try a second table. at2 contains a scalar attribute followed by a
+ // container named 'a'.
+ AttrTable *at2;
+ try {
+ at2 = new AttrTable;
+ at2->set_name("at2");
+ at2->append_attr("color", "String", "red");
+ AttrTable *cont_at2 = at2->append_container("cont_at2");
+ cont_at2->append_attr("size", "Int32", "7");
+ cont_at2->append_attr("type", "String", "cars");
+ i = at2->attr_begin();
+ CPPUNIT_ASSERT(at2->get_name(i) == "color");
+ i++;
+ CPPUNIT_ASSERT(at2->get_name(i) == "cont_at2");
+
+ at2->del_attr_table(i);
+
+ i = at2->attr_begin();
+ CPPUNIT_ASSERT(at2->get_name(i) == "color");
+ i++;
+ CPPUNIT_ASSERT(i == at2->attr_end());
+
+ delete at2;
+ at2 = 0;
}
-
- void print_xml_test() {
- at1->print_xml(stdout);
+ catch (Error &e) {
+ cerr << "Error: " << e.get_error_message() << endl;
+ delete at2;
+ at2 = 0;
+ throw;
}
- };
+ catch (...) {
+ cerr << "caught an exception!" << endl;
+ delete at2;
+ at2 = 0;
+ throw;
+ }
+ }
- CPPUNIT_TEST_SUITE_REGISTRATION(AttrTableTest);
+ void append_attr_vector_test()
+ {
+ // ("size", "Int32", "7")
+ vector<string> vs;
+ vs.push_back("8");
+ vs.push_back("9");
+ cont_a->append_attr("size", "Int32", &vs);
+
+ CPPUNIT_ASSERT(cont_a->get_attr("size", 0) == "7");
+ CPPUNIT_ASSERT(cont_a->get_attr("size", 1) == "8");
+ CPPUNIT_ASSERT(cont_a->get_attr("size", 2) == "9");
+ CPPUNIT_ASSERT(cont_a->get_attr_num("size") == 3);
+ }
+
+ void print_xml_test()
+ {
+ at1->print_xml(stdout);
+ }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (AttrTableTest);
} // namespace libdap
-int
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
- GetOpt getopt(argc, argv, "d");
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
- case 'd':
- debug = 1; // debug is a static global
- break;
- default:
- break;
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: AttrTableTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::AttrTableTest::suite()->getTests();
+ unsigned int prefix_len = libdap::AttrTableTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
}
CppUnit::TextTestRunner runner;
@@ -439,10 +469,9 @@ main(int argc, char *argv[])
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::AttrTableTest::") + argv[i++];
- if (debug)
- cerr << "Running " << test << endl;
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::AttrTableTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/ByteTest.cc b/unit-tests/ByteTest.cc
index 70f8469..ed446b4 100644
--- a/unit-tests/ByteTest.cc
+++ b/unit-tests/ByteTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -38,32 +37,46 @@
#include "Byte.h"
+#include "GetOpt.h" // Added jhrg
+
#include "testFile.h"
+/// Added jhrg
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) (x); } while(false);
+/// jhrg
+
using namespace CppUnit;
using namespace std;
using namespace libdap;
-class ByteTest:public TestFixture {
- private:
+class ByteTest: public TestFixture {
+private:
Byte * tb1;
Byte *tb2;
Byte *tb3;
Byte *tb4;
- public:
- ByteTest() {
- } ~ByteTest() {
+public:
+ ByteTest()
+ {
+ }
+ ~ByteTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
tb1 = new Byte("tb1");
tb2 = new Byte("tb2 name with spaces");
tb3 = new Byte("tb3 %");
tb4 = new Byte("tb4 #");
}
- void tearDown() {
+ void tearDown()
+ {
delete tb1;
tb1 = 0;
delete tb2;
@@ -74,21 +87,23 @@ class ByteTest:public TestFixture {
tb4 = 0;
}
- CPPUNIT_TEST_SUITE(ByteTest);
+ CPPUNIT_TEST_SUITE (ByteTest);
- CPPUNIT_TEST(name_mangling_test);
- CPPUNIT_TEST(decl_mangling_test);
+ CPPUNIT_TEST (name_mangling_test);
+ CPPUNIT_TEST (decl_mangling_test);
CPPUNIT_TEST_SUITE_END();
- void name_mangling_test() {
+ void name_mangling_test()
+ {
CPPUNIT_ASSERT(tb1->name() == "tb1");
CPPUNIT_ASSERT(tb2->name() == "tb2 name with spaces");
CPPUNIT_ASSERT(tb3->name() == "tb3 %");
CPPUNIT_ASSERT(tb4->name() == "tb4 #");
}
- void decl_mangling_test() {
+ void decl_mangling_test()
+ {
ostringstream sof;
tb1->print_decl(sof, "", false);
CPPUNIT_ASSERT(sof.str().find("Byte tb1") != string::npos);
@@ -105,14 +120,53 @@ class ByteTest:public TestFixture {
};
-CPPUNIT_TEST_SUITE_REGISTRATION(ByteTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (ByteTest);
-int main(int, char **)
+int main(int argc, char *argv[])
{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: ByteTest has the following tests:" << endl;
+ // Since the ByteTest class is not in the namespace 'libdap' using the ns
+ // prefix is a compiler error. Somce of the tests do put the code in a ns
+ // and then you will need to use the match prefix. jhrg
+ const std::vector<Test*> &tests = /*libdap:: jhrg*/ByteTest::suite()->getTests();
+ unsigned int prefix_len = /*libdap:: jhrg*/ByteTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- bool wasSuccessful = runner.run("", false);
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = /*libdap:: jhrg*/ByteTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/D4AsyncDocTest.cc b/unit-tests/D4AsyncDocTest.cc
index f6fe394..dadbcec 100644
--- a/unit-tests/D4AsyncDocTest.cc
+++ b/unit-tests/D4AsyncDocTest.cc
@@ -51,38 +51,43 @@ static bool debug = false;
#undef DBG
#define DBG(x) do { if (debug) (x); } while(false);
-
class D4AsyncDocTest: public TestFixture {
private:
XMLWriter *xml;
public:
- D4AsyncDocTest(): xml(0) {
+ D4AsyncDocTest() :
+ xml(0)
+ {
}
- ~D4AsyncDocTest() {
+ ~D4AsyncDocTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
xml = new XMLWriter;
}
- void tearDown() {
+ void tearDown()
+ {
delete xml;
}
// An empty D4Dimensions object prints nothing; the XMLWriter class adds
// a xml doc preface.
- void test_async_required() {
+ void test_async_required()
+ {
DBG(cerr << endl << " ---- test_async_required - BEGIN" << endl);
- D4AsyncUtil dau;
+ D4AsyncUtil dau;
DBG(cerr << endl);
- string *stylesheet_ref=0;
+ string *stylesheet_ref = 0;
- dau.writeD4AsyncRequired(*xml, 6001, 600007, stylesheet_ref);
+ dau.writeD4AsyncRequired(*xml, 6001, 600007, stylesheet_ref);
string doc = xml->get_doc();
DBG(cerr << "[test_async_required - candidate doc]" << endl << doc << endl);
@@ -96,15 +101,16 @@ public:
// An empty D4Dimensions object prints nothing; the XMLWriter class adds
// a xml doc preface.
- void test_async_required_with_stylesheet_ref() {
+ void test_async_required_with_stylesheet_ref()
+ {
DBG(cerr << endl << " ---- test_async_required - BEGIN" << endl);
- D4AsyncUtil dau;
+ D4AsyncUtil dau;
DBG(cerr << endl);
- string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+ string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
- dau.writeD4AsyncRequired(*xml, 6001, 600007, &stylesheet_ref);
+ dau.writeD4AsyncRequired(*xml, 6001, 600007, &stylesheet_ref);
string doc = xml->get_doc();
DBG(cerr << "[test_async_required - candidate doc]" << endl << doc << endl);
@@ -117,203 +123,219 @@ public:
}
// An empty D4Dimensions object prints nothing; the XMLWriter class adds
- // a xml doc preface.
- void test_async_accepted() {
- DBG(cerr << endl << " ---- test_async_accepted - BEGIN" << endl);
-
- D4AsyncUtil dau;
- DBG(cerr << endl);
-
- string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
-
- dau.writeD4AsyncAccepted(*xml, 6003, 600009,"http://test.opendap.org:8080/opendap/storedResults/result_87697163.dap");
-
- string doc = xml->get_doc();
- DBG(cerr << "[test_async_accepted - candidate doc]" << endl << doc << endl);
-
- string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncAccepted.xml");
- DBG(cerr << "[test_async_accepted - baseline doc]" << endl << baseline << endl);
- CPPUNIT_ASSERT(doc == baseline);
- DBG(cerr << endl << " ---- test_async_accepted - END" << endl);
- }
-
- // An empty D4Dimensions object prints nothing; the XMLWriter class adds
- // a xml doc preface.
- void test_async_accepted_with_stylesheet_ref() {
- DBG(cerr << endl << " ---- test_async_accepted - BEGIN" << endl);
-
- D4AsyncUtil dau;
- DBG(cerr << endl);
- string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+ // a xml doc preface.
+ void test_async_accepted()
+ {
+ DBG(cerr << endl << " ---- test_async_accepted - BEGIN" << endl);
- dau.writeD4AsyncAccepted(*xml, 6003, 600009,"http://test.opendap.org:8080/opendap/storedResults/result_87697163.dap", &stylesheet_ref);
+ D4AsyncUtil dau;
+ DBG(cerr << endl);
- string doc = xml->get_doc();
- DBG(cerr << "[test_async_accepted - candidate doc]" << endl << doc << endl);
+ string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
- string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncAccepted_StyleRef.xml");
- DBG(cerr << "[test_async_accepted - baseline doc]" << endl << baseline << endl);
- CPPUNIT_ASSERT(doc == baseline);
- DBG(cerr << endl << " ---- test_async_accepted - END" << endl);
- }
+ dau.writeD4AsyncAccepted(*xml, 6003, 600009,
+ "http://test.opendap.org:8080/opendap/storedResults/result_87697163.dap");
+ string doc = xml->get_doc();
+ DBG(cerr << "[test_async_accepted - candidate doc]" << endl << doc << endl);
- // An empty D4Dimensions object prints nothing; the XMLWriter class adds
- // a xml doc preface.
- void test_async_pending() {
- DBG(cerr << endl << " ---- test_async_pending - BEGIN" << endl);
+ string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncAccepted.xml");
+ DBG(cerr << "[test_async_accepted - baseline doc]" << endl << baseline << endl);
+ CPPUNIT_ASSERT(doc == baseline);
+ DBG(cerr << endl << " ---- test_async_accepted - END" << endl);
+ }
- D4AsyncUtil dau;
- DBG(cerr << endl);
+ // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+ // a xml doc preface.
+ void test_async_accepted_with_stylesheet_ref()
+ {
+ DBG(cerr << endl << " ---- test_async_accepted - BEGIN" << endl);
- dau.writeD4AsyncPending(*xml);
+ D4AsyncUtil dau;
+ DBG(cerr << endl);
+ string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
- string doc = xml->get_doc();
- DBG(cerr << "[test_async_pending - candidate doc]" << endl << doc << endl);
+ dau.writeD4AsyncAccepted(*xml, 6003, 600009,
+ "http://test.opendap.org:8080/opendap/storedResults/result_87697163.dap", &stylesheet_ref);
- string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncPending.xml");
- DBG(cerr << "[test_async_pending - baseline doc]" << endl << baseline << endl);
- CPPUNIT_ASSERT(doc == baseline);
- DBG(cerr << endl << " ---- test_async_pending - END" << endl);
- }
+ string doc = xml->get_doc();
+ DBG(cerr << "[test_async_accepted - candidate doc]" << endl << doc << endl);
+ string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncAccepted_StyleRef.xml");
+ DBG(cerr << "[test_async_accepted - baseline doc]" << endl << baseline << endl);
+ CPPUNIT_ASSERT(doc == baseline);
+ DBG(cerr << endl << " ---- test_async_accepted - END" << endl);
+ }
+ // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+ // a xml doc preface.
+ void test_async_pending()
+ {
+ DBG(cerr << endl << " ---- test_async_pending - BEGIN" << endl);
- // An empty D4Dimensions object prints nothing; the XMLWriter class adds
- // a xml doc preface.
- void test_async_pending_with_stylesheet_ref() {
- DBG(cerr << endl << " ---- test_async_pending - BEGIN" << endl);
+ D4AsyncUtil dau;
+ DBG(cerr << endl);
- D4AsyncUtil dau;
- DBG(cerr << endl);
- string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+ dau.writeD4AsyncPending(*xml);
- dau.writeD4AsyncPending(*xml, &stylesheet_ref);
+ string doc = xml->get_doc();
+ DBG(cerr << "[test_async_pending - candidate doc]" << endl << doc << endl);
- string doc = xml->get_doc();
- DBG(cerr << "[test_async_pending - candidate doc]" << endl << doc << endl);
+ string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncPending.xml");
+ DBG(cerr << "[test_async_pending - baseline doc]" << endl << baseline << endl);
+ CPPUNIT_ASSERT(doc == baseline);
+ DBG(cerr << endl << " ---- test_async_pending - END" << endl);
+ }
- string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncPending_StyleRef.xml");
- DBG(cerr << "[test_async_pending - baseline doc]" << endl << baseline << endl);
- CPPUNIT_ASSERT(doc == baseline);
- DBG(cerr << endl << " ---- test_async_pending - END" << endl);
- }
+ // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+ // a xml doc preface.
+ void test_async_pending_with_stylesheet_ref()
+ {
+ DBG(cerr << endl << " ---- test_async_pending - BEGIN" << endl);
- // An empty D4Dimensions object prints nothing; the XMLWriter class adds
- // a xml doc preface.
- void test_async_ResponseGone() {
- DBG(cerr << endl << " ---- test_async_ResponseGone - BEGIN" << endl);
+ D4AsyncUtil dau;
+ DBG(cerr << endl);
+ string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
- D4AsyncUtil dau;
- DBG(cerr << endl);
+ dau.writeD4AsyncPending(*xml, &stylesheet_ref);
- dau.writeD4AsyncResponseGone(*xml);
+ string doc = xml->get_doc();
+ DBG(cerr << "[test_async_pending - candidate doc]" << endl << doc << endl);
- string doc = xml->get_doc();
- DBG(cerr << "[test_async_ResponseGone - candidate doc]" << endl << doc << endl);
+ string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncPending_StyleRef.xml");
+ DBG(cerr << "[test_async_pending - baseline doc]" << endl << baseline << endl);
+ CPPUNIT_ASSERT(doc == baseline);
+ DBG(cerr << endl << " ---- test_async_pending - END" << endl);
+ }
- string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncGone.xml");
- DBG(cerr << "[test_async_ResponseGone - baseline doc]" << endl << baseline << endl);
- CPPUNIT_ASSERT(doc == baseline);
- DBG(cerr << endl << " ---- test_async_ResponseGone - END" << endl);
- }
+ // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+ // a xml doc preface.
+ void test_async_ResponseGone()
+ {
+ DBG(cerr << endl << " ---- test_async_ResponseGone - BEGIN" << endl);
- // An empty D4Dimensions object prints nothing; the XMLWriter class adds
- // a xml doc preface.
- void test_async_ResponseGone_with_stylesheet_ref() {
- DBG(cerr << endl << " ---- test_async_ResponseGone - BEGIN" << endl);
+ D4AsyncUtil dau;
+ DBG(cerr << endl);
- D4AsyncUtil dau;
- DBG(cerr << endl);
- string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+ dau.writeD4AsyncResponseGone(*xml);
- dau.writeD4AsyncResponseGone(*xml, &stylesheet_ref);
+ string doc = xml->get_doc();
+ DBG(cerr << "[test_async_ResponseGone - candidate doc]" << endl << doc << endl);
- string doc = xml->get_doc();
- DBG(cerr << "[test_async_ResponseGone - candidate doc]" << endl << doc << endl);
+ string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncGone.xml");
+ DBG(cerr << "[test_async_ResponseGone - baseline doc]" << endl << baseline << endl);
+ CPPUNIT_ASSERT(doc == baseline);
+ DBG(cerr << endl << " ---- test_async_ResponseGone - END" << endl);
+ }
- string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncGone_StyleRef.xml");
- DBG(cerr << "[test_async_ResponseGone - baseline doc]" << endl << baseline << endl);
- CPPUNIT_ASSERT(doc == baseline);
- DBG(cerr << endl << " ---- test_async_ResponseGone - END" << endl);
- }
+ // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+ // a xml doc preface.
+ void test_async_ResponseGone_with_stylesheet_ref()
+ {
+ DBG(cerr << endl << " ---- test_async_ResponseGone - BEGIN" << endl);
+ D4AsyncUtil dau;
+ DBG(cerr << endl);
+ string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
- // An empty D4Dimensions object prints nothing; the XMLWriter class adds
- // a xml doc preface.
- void test_async_ResponseRejected() {
+ dau.writeD4AsyncResponseGone(*xml, &stylesheet_ref);
- D4AsyncUtil dau;
- DBG(cerr << endl << " ---- test_async_ResponseRejected - BEGIN" << endl);
+ string doc = xml->get_doc();
+ DBG(cerr << "[test_async_ResponseGone - candidate doc]" << endl << doc << endl);
- dau.writeD4AsyncResponseRejected(*xml, TIME,"The time to process your request is longer than the time you indicated was acceptable.");
+ string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncGone_StyleRef.xml");
+ DBG(cerr << "[test_async_ResponseGone - baseline doc]" << endl << baseline << endl);
+ CPPUNIT_ASSERT(doc == baseline);
+ DBG(cerr << endl << " ---- test_async_ResponseGone - END" << endl);
+ }
- string doc = xml->get_doc();
- DBG(cerr << "[test_async_ResponseRejected - candidate doc]" << endl << doc << endl);
+ // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+ // a xml doc preface.
+ void test_async_ResponseRejected()
+ {
- string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncRejected.xml");
- DBG(cerr << "[test_async_ResponseRejected - baseline doc]" << endl << baseline << endl);
- CPPUNIT_ASSERT(doc == baseline);
+ D4AsyncUtil dau;
+ DBG(cerr << endl << " ---- test_async_ResponseRejected - BEGIN" << endl);
- DBG(cerr << endl << " ---- test_async_ResponseRejected - END" << endl);
- }
+ dau.writeD4AsyncResponseRejected(*xml, TIME,
+ "The time to process your request is longer than the time you indicated was acceptable.");
+ string doc = xml->get_doc();
+ DBG(cerr << "[test_async_ResponseRejected - candidate doc]" << endl << doc << endl);
+ string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncRejected.xml");
+ DBG(cerr << "[test_async_ResponseRejected - baseline doc]" << endl << baseline << endl);
+ CPPUNIT_ASSERT(doc == baseline);
- // An empty D4Dimensions object prints nothing; the XMLWriter class adds
- // a xml doc preface.
- void test_async_ResponseRejected_with_stylesheet_ref() {
+ DBG(cerr << endl << " ---- test_async_ResponseRejected - END" << endl);
+ }
- D4AsyncUtil dau;
- DBG(cerr << endl << " ---- test_async_ResponseRejected - BEGIN" << endl);
- string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
+ // An empty D4Dimensions object prints nothing; the XMLWriter class adds
+ // a xml doc preface.
+ void test_async_ResponseRejected_with_stylesheet_ref()
+ {
- dau.writeD4AsyncResponseRejected(*xml, TIME,"The time to process your request is longer than the time you indicated was acceptable.", &stylesheet_ref);
+ D4AsyncUtil dau;
+ DBG(cerr << endl << " ---- test_async_ResponseRejected - BEGIN" << endl);
+ string stylesheet_ref = "http://someServer:8080/opendap/xsl/asyncResponse.xsl";
- string doc = xml->get_doc();
- DBG(cerr << "[test_async_ResponseRejected - candidate doc]" << endl << doc << endl);
+ dau.writeD4AsyncResponseRejected(*xml, TIME,
+ "The time to process your request is longer than the time you indicated was acceptable.", &stylesheet_ref);
- string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncRejected_StyleRef.xml");
- DBG(cerr << "[test_async_ResponseRejected - baseline doc]" << endl << baseline << endl);
- CPPUNIT_ASSERT(doc == baseline);
+ string doc = xml->get_doc();
+ DBG(cerr << "[test_async_ResponseRejected - candidate doc]" << endl << doc << endl);
- DBG(cerr << endl << " ---- test_async_ResponseRejected - END" << endl);
- }
+ string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4AsyncRejected_StyleRef.xml");
+ DBG(cerr << "[test_async_ResponseRejected - baseline doc]" << endl << baseline << endl);
+ CPPUNIT_ASSERT(doc == baseline);
+ DBG(cerr << endl << " ---- test_async_ResponseRejected - END" << endl);
+ }
- CPPUNIT_TEST_SUITE( D4AsyncDocTest );
+ CPPUNIT_TEST_SUITE (D4AsyncDocTest);
- CPPUNIT_TEST(test_async_required);
- CPPUNIT_TEST(test_async_required_with_stylesheet_ref);
- CPPUNIT_TEST(test_async_accepted);
- CPPUNIT_TEST(test_async_accepted_with_stylesheet_ref);
- CPPUNIT_TEST(test_async_pending);
- CPPUNIT_TEST(test_async_pending_with_stylesheet_ref);
- CPPUNIT_TEST(test_async_ResponseGone);
- CPPUNIT_TEST(test_async_ResponseGone_with_stylesheet_ref);
- CPPUNIT_TEST(test_async_ResponseRejected);
- CPPUNIT_TEST(test_async_ResponseRejected_with_stylesheet_ref);
+ CPPUNIT_TEST (test_async_required);
+ CPPUNIT_TEST (test_async_required_with_stylesheet_ref);
+ CPPUNIT_TEST (test_async_accepted);
+ CPPUNIT_TEST (test_async_accepted_with_stylesheet_ref);
+ CPPUNIT_TEST (test_async_pending);
+ CPPUNIT_TEST (test_async_pending_with_stylesheet_ref);
+ CPPUNIT_TEST (test_async_ResponseGone);
+ CPPUNIT_TEST (test_async_ResponseGone_with_stylesheet_ref);
+ CPPUNIT_TEST (test_async_ResponseRejected);
+ CPPUNIT_TEST (test_async_ResponseRejected_with_stylesheet_ref);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(D4AsyncDocTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (D4AsyncDocTest);
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4AsyncDocTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = D4AsyncDocTest::suite()->getTests();
+ unsigned int prefix_len = D4AsyncDocTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -322,9 +344,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("D4AsyncDocTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = D4AsyncDocTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
@@ -332,8 +354,6 @@ int main(int argc, char*argv[]) {
return wasSuccessful ? 0 : 1;
}
-
-
#if 0
int main(int, char**) {
diff --git a/unit-tests/D4AttributesTest.cc b/unit-tests/D4AttributesTest.cc
index b7b86a4..ac110f5 100644
--- a/unit-tests/D4AttributesTest.cc
+++ b/unit-tests/D4AttributesTest.cc
@@ -36,6 +36,7 @@
#include "testFile.h"
#include "test_config.h"
+#include "GetOpt.h"
using namespace CppUnit;
using namespace std;
@@ -54,13 +55,16 @@ private:
D4Attribute a, a2, a3, a4, a5, c, c2;
public:
- D4AttributesTest() {
+ D4AttributesTest()
+ {
}
- ~D4AttributesTest() {
+ ~D4AttributesTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
attrs = new D4Attributes;
xml = new XMLWriter;
@@ -78,7 +82,10 @@ public:
a3.set_name("color");
a3.set_type(attr_str_c);
- vector<string> colors; colors.push_back("red"); colors.push_back("blue"); colors.push_back("green");
+ vector<string> colors;
+ colors.push_back("red");
+ colors.push_back("blue");
+ colors.push_back("green");
a3.add_value_vector(colors);
a4 = a2;
@@ -93,14 +100,16 @@ public:
c2.attributes()->add_attribute(&c);
}
- void tearDown() {
+ void tearDown()
+ {
delete xml;
delete attrs;
}
// An empty D4Dimensions object prints nothing; the XMLWriter class adds
// a xml doc preface.
- void test_print_empty() {
+ void test_print_empty()
+ {
attrs->print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_empty.xml");
@@ -108,7 +117,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_single_attribute() {
+ void test_print_single_attribute()
+ {
a.print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Attributes_values_1.xml");
@@ -117,7 +127,8 @@ public:
}
- void test_print_1() {
+ void test_print_1()
+ {
attrs->add_attribute(&a);
attrs->print_dap4(*xml);
@@ -127,8 +138,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
-
- void test_print_2() {
+ void test_print_2()
+ {
attrs->add_attribute(&a);
attrs->add_attribute(&a2);
@@ -139,7 +150,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_3() {
+ void test_print_3()
+ {
attrs->add_attribute(&a);
attrs->add_attribute(&a2);
attrs->add_attribute(&c);
@@ -152,7 +164,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_assignment() {
+ void test_print_assignment()
+ {
attrs->add_attribute(&a);
attrs->add_attribute(&a2);
@@ -165,7 +178,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_assignment_2() {
+ void test_print_assignment_2()
+ {
attrs->add_attribute(&a);
attrs->add_attribute(&a2);
attrs->add_attribute(&c);
@@ -180,7 +194,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_copy_ctor() {
+ void test_print_copy_ctor()
+ {
attrs->add_attribute(&a);
attrs->add_attribute(&a2);
@@ -193,7 +208,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_find() {
+ void test_find()
+ {
attrs->add_attribute(&a);
attrs->add_attribute(&a2);
attrs->add_attribute(&c);
@@ -218,7 +234,8 @@ public:
CPPUNIT_ASSERT(baseline == find_result);
}
- void test_get() {
+ void test_get()
+ {
attrs->add_attribute(&a);
attrs->add_attribute(&a2);
attrs->add_attribute(&c);
@@ -243,7 +260,8 @@ public:
CPPUNIT_ASSERT(baseline == get_result);
}
- void test_get2() {
+ void test_get2()
+ {
attrs->add_attribute(&a);
attrs->add_attribute(&a2);
attrs->add_attribute(&c);
@@ -275,33 +293,68 @@ public:
CPPUNIT_ASSERT(baseline == get_result);
}
- CPPUNIT_TEST_SUITE( D4AttributesTest );
+ CPPUNIT_TEST_SUITE (D4AttributesTest);
- CPPUNIT_TEST(test_print_empty);
- CPPUNIT_TEST(test_print_single_attribute);
- CPPUNIT_TEST(test_print_1);
- CPPUNIT_TEST(test_print_2);
- CPPUNIT_TEST(test_print_3);
+ CPPUNIT_TEST (test_print_empty);
+ CPPUNIT_TEST (test_print_single_attribute);
+ CPPUNIT_TEST (test_print_1);
+ CPPUNIT_TEST (test_print_2);
+ CPPUNIT_TEST (test_print_3);
- CPPUNIT_TEST(test_print_assignment);
- CPPUNIT_TEST(test_print_assignment_2);
+ CPPUNIT_TEST (test_print_assignment);
+ CPPUNIT_TEST (test_print_assignment_2);
- CPPUNIT_TEST(test_print_copy_ctor);
+ CPPUNIT_TEST (test_print_copy_ctor);
- CPPUNIT_TEST(test_find);
- CPPUNIT_TEST(test_get);
- CPPUNIT_TEST(test_get2);
+ CPPUNIT_TEST (test_find);
+ CPPUNIT_TEST (test_get);
+ CPPUNIT_TEST (test_get2);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(D4AttributesTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (D4AttributesTest);
+
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4AttributesTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = D4AttributesTest::suite()->getTests();
+ unsigned int prefix_len = D4AttributesTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
-int main(int, char**) {
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- bool wasSuccessful = runner.run("", false);
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = D4AttributesTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/D4DimensionsTest.cc b/unit-tests/D4DimensionsTest.cc
index ff8445d..ea9adc6 100644
--- a/unit-tests/D4DimensionsTest.cc
+++ b/unit-tests/D4DimensionsTest.cc
@@ -56,25 +56,31 @@ private:
D4Dimensions *d;
public:
- D4DimensionsTest() : xml(0), d(0) {
+ D4DimensionsTest() :
+ xml(0), d(0)
+ {
}
- ~D4DimensionsTest() {
+ ~D4DimensionsTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
d = new D4Dimensions;
xml = new XMLWriter;
}
- void tearDown() {
+ void tearDown()
+ {
delete xml;
delete d;
}
// An empty D4Dimensions object prints nothing; the XMLWriter class adds
// a xml doc preface.
- void test_print_empty() {
+ void test_print_empty()
+ {
d->print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Dimensions_empty.xml");
@@ -83,7 +89,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_1() {
+ void test_print_1()
+ {
d->add_dim_nocopy(new D4Dimension("first", 10));
d->print_dap4(*xml);
@@ -94,7 +101,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_2() {
+ void test_print_2()
+ {
d->add_dim_nocopy(new D4Dimension("first", 10));
d->add_dim_nocopy(new D4Dimension("second", 100));
@@ -106,7 +114,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_error() {
+ void test_error()
+ {
D4Dimension *d3, *d2;
try {
d2 = new D4Dimension();
@@ -116,16 +125,19 @@ public:
d3 = new D4Dimension();
d3->set_name("error");
d3->set_size("20.0");
- delete d3; delete d2;
+ delete d3;
+ delete d2;
CPPUNIT_FAIL("Should throw an Error");
}
- catch(...) {
- delete d3; delete d2;
+ catch (...) {
+ delete d3;
+ delete d2;
throw;
}
}
- void test_error_2() {
+ void test_error_2()
+ {
D4Dimension *d3;
try {
d3 = new D4Dimension();
@@ -134,7 +146,7 @@ public:
delete d3;
CPPUNIT_FAIL("Should throw an Error");
}
- catch(...) {
+ catch (...) {
delete d3;
throw;
}
@@ -153,7 +165,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
#endif
- void test_print_insert_dim() {
+ void test_print_insert_dim()
+ {
d->add_dim_nocopy(new D4Dimension("first", 10));
d->add_dim_nocopy(new D4Dimension("second", 100));
d->add_dim_nocopy(new D4Dimension("third", 1000));
@@ -170,7 +183,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_assignment() {
+ void test_print_assignment()
+ {
d->add_dim_nocopy(new D4Dimension("first", 10));
d->add_dim_nocopy(new D4Dimension("second", 100));
d->add_dim_nocopy(new D4Dimension("third", 1000));
@@ -185,7 +199,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_copy_ctor() {
+ void test_print_copy_ctor()
+ {
d->add_dim_nocopy(new D4Dimension("first", 10));
d->add_dim_nocopy(new D4Dimension("second", 100));
d->add_dim_nocopy(new D4Dimension("third", 1000));
@@ -200,32 +215,30 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- CPPUNIT_TEST_SUITE( D4DimensionsTest );
+ CPPUNIT_TEST_SUITE (D4DimensionsTest);
- CPPUNIT_TEST(test_print_empty);
- CPPUNIT_TEST(test_print_1);
- CPPUNIT_TEST(test_print_2);
+ CPPUNIT_TEST (test_print_empty);
+ CPPUNIT_TEST (test_print_1);
+ CPPUNIT_TEST (test_print_2);
- CPPUNIT_TEST_EXCEPTION( test_error, Error );
- //CPPUNIT_TEST( test_error );
- CPPUNIT_TEST_EXCEPTION( test_error_2, Error );
+ CPPUNIT_TEST_EXCEPTION( test_error, Error );
+ //CPPUNIT_TEST( test_error );
+ CPPUNIT_TEST_EXCEPTION( test_error_2, Error );
#ifdef VARYING
- CPPUNIT_TEST(test_print_varying);
+ CPPUNIT_TEST(test_print_varying);
#endif
- CPPUNIT_TEST(test_print_insert_dim);
- CPPUNIT_TEST(test_print_assignment);
- CPPUNIT_TEST(test_print_copy_ctor);
+ CPPUNIT_TEST (test_print_insert_dim);
+ CPPUNIT_TEST (test_print_assignment);
+ CPPUNIT_TEST (test_print_copy_ctor);
CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(D4DimensionsTest);
-
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+CPPUNIT_TEST_SUITE_REGISTRATION (D4DimensionsTest);
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
@@ -233,10 +246,22 @@ int main(int argc, char*argv[]) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4DimensionsTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = D4DimensionsTest::suite()->getTests();
+ unsigned int prefix_len = D4DimensionsTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -245,9 +270,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("D4DimensionsTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = D4DimensionsTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/D4EnumDefsTest.cc b/unit-tests/D4EnumDefsTest.cc
index bada5c9..d4777ee 100644
--- a/unit-tests/D4EnumDefsTest.cc
+++ b/unit-tests/D4EnumDefsTest.cc
@@ -37,10 +37,14 @@
#include "testFile.h"
#include "test_config.h"
+#include "GetOpt.h"
+
using namespace CppUnit;
using namespace std;
using namespace libdap;
+static bool debug = false;
+
class D4EnumDefsTest: public TestFixture {
private:
XMLWriter *xml;
@@ -49,13 +53,16 @@ private:
D4EnumDef e, e2;
public:
- D4EnumDefsTest() {
+ D4EnumDefsTest()
+ {
}
- ~D4EnumDefsTest() {
+ ~D4EnumDefsTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
d = new D4EnumDefs;
xml = new XMLWriter;
@@ -70,23 +77,25 @@ public:
e2.add_value("ice", 10000);
}
- void tearDown() {
+ void tearDown()
+ {
delete xml;
delete d;
}
// An empty D4Dimensions object prints nothing; the XMLWriter class adds
// a xml doc preface.
- void test_print_empty() {
+ void test_print_empty()
+ {
d->print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_empty.xml");
- DBG(cerr << "test_print_empty: doc: " << doc << endl);
- DBG(cerr << "test_print_empty: baseline: " << baseline << endl);
+ DBG(cerr << "test_print_empty: doc: " << doc << endl);DBG(cerr << "test_print_empty: baseline: " << baseline << endl);
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_enum_values_only() {
+ void test_print_enum_values_only()
+ {
D4EnumDef e;
e.add_value("red", 1);
e.add_value("blue", 2);
@@ -94,37 +103,36 @@ public:
e.print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_values_1.xml");
- DBG(cerr << "test_print_enum_values_only: doc: " << doc << endl);
- DBG(cerr << "test_print_enum_values_only: baseline: " << baseline << endl);
+ DBG(cerr << "test_print_enum_values_only: doc: " << doc << endl);DBG(cerr << "test_print_enum_values_only: baseline: " << baseline << endl);
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_1() {
+ void test_print_1()
+ {
d->add_enum(&e);
d->print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_1.xml");
- DBG(cerr << "test_print_1: doc: " << doc << endl);
- DBG(cerr << "test_print_1: baseline: " << baseline << endl);
+ DBG(cerr << "test_print_1: doc: " << doc << endl);DBG(cerr << "test_print_1: baseline: " << baseline << endl);
CPPUNIT_ASSERT(doc == baseline);
}
-
- void test_print_2() {
+ void test_print_2()
+ {
d->add_enum(&e);
d->add_enum(&e2);
d->print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_2.xml");
- DBG(cerr << "test_print_2: doc: " << doc << endl);
- DBG(cerr << "test_print_2: baseline: " << baseline << endl);
+ DBG(cerr << "test_print_2: doc: " << doc << endl);DBG(cerr << "test_print_2: baseline: " << baseline << endl);
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_insert_enum() {
+ void test_print_insert_enum()
+ {
d->add_enum(&e);
// "second' winds up before 'first'
@@ -134,12 +142,12 @@ public:
d->print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_3.xml");
- DBG(cerr << "test_print_insert_enum: doc: " << doc << endl);
- DBG(cerr << "test_print_insert_enum: baseline: " << baseline << endl);
+ DBG(cerr << "test_print_insert_enum: doc: " << doc << endl);DBG(cerr << "test_print_insert_enum: baseline: " << baseline << endl);
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_assignment() {
+ void test_print_assignment()
+ {
d->add_enum(&e);
d->add_enum(&e2);
@@ -148,12 +156,12 @@ public:
lhs.print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_2.xml");
- DBG(cerr << "test_print_assignment: doc: " << doc << endl);
- DBG(cerr << "test_print_assignment: baseline: " << baseline << endl);
+ DBG(cerr << "test_print_assignment: doc: " << doc << endl);DBG(cerr << "test_print_assignment: baseline: " << baseline << endl);
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_copy_ctor() {
+ void test_print_copy_ctor()
+ {
d->add_enum(&e);
d->add_enum(&e2);
@@ -162,32 +170,66 @@ public:
lhs.print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4EnumDefs_2.xml");
- DBG(cerr << "test_print_copy_ctor: doc: " << doc << endl);
- DBG(cerr << "test_print_copy_ctor: baseline: " << baseline << endl);
+ DBG(cerr << "test_print_copy_ctor: doc: " << doc << endl);DBG(cerr << "test_print_copy_ctor: baseline: " << baseline << endl);
CPPUNIT_ASSERT(doc == baseline);
}
- CPPUNIT_TEST_SUITE( D4EnumDefsTest );
+ CPPUNIT_TEST_SUITE (D4EnumDefsTest);
- CPPUNIT_TEST(test_print_empty);
- CPPUNIT_TEST(test_print_enum_values_only);
- CPPUNIT_TEST(test_print_1);
- CPPUNIT_TEST(test_print_2);
+ CPPUNIT_TEST (test_print_empty);
+ CPPUNIT_TEST (test_print_enum_values_only);
+ CPPUNIT_TEST (test_print_1);
+ CPPUNIT_TEST (test_print_2);
- CPPUNIT_TEST(test_print_insert_enum);
- CPPUNIT_TEST(test_print_assignment);
- CPPUNIT_TEST(test_print_copy_ctor);
+ CPPUNIT_TEST (test_print_insert_enum);
+ CPPUNIT_TEST (test_print_assignment);
+ CPPUNIT_TEST (test_print_copy_ctor);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(D4EnumDefsTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (D4EnumDefsTest);
+
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4EnumDefsTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = D4EnumDefsTest::suite()->getTests();
+ unsigned int prefix_len = D4EnumDefsTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
-int main(int, char**) {
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- bool wasSuccessful = runner.run("", false);
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = D4EnumDefsTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/D4EnumTest.cc b/unit-tests/D4EnumTest.cc
index ffbb722..415d1ec 100644
--- a/unit-tests/D4EnumTest.cc
+++ b/unit-tests/D4EnumTest.cc
@@ -55,111 +55,128 @@ private:
D4Enum *d;
public:
- D4EnumTest() : xml(0), d(0) {
+ D4EnumTest() :
+ xml(0), d(0)
+ {
}
- ~D4EnumTest() {
+ ~D4EnumTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
d = new D4Enum("test", "Byte");
xml = new XMLWriter;
}
- void tearDown() {
+ void tearDown()
+ {
delete xml;
delete d;
}
- void test_first_ctor() {
- D4Enum e("first", "Byte");
- CPPUNIT_ASSERT(e.d_element_type == dods_byte_c);
- CPPUNIT_ASSERT(e.name() == "first");
+ void test_first_ctor()
+ {
+ D4Enum e("first", "Byte");
+ CPPUNIT_ASSERT(e.d_element_type == dods_byte_c);
+ CPPUNIT_ASSERT(e.name() == "first");
}
// Tests bogus type name
- void test_first_ctor2() {
- D4Enum e("bogus", "String");
- CPPUNIT_ASSERT(e.d_element_type == dods_uint64_c);
- CPPUNIT_ASSERT(e.name() == "bogus");
+ void test_first_ctor2()
+ {
+ D4Enum e("bogus", "String");
+ CPPUNIT_ASSERT(e.d_element_type == dods_uint64_c);
+ CPPUNIT_ASSERT(e.name() == "bogus");
}
- void test_second_ctor() {
- D4Enum e("second", dods_byte_c);
- CPPUNIT_ASSERT(e.d_element_type == dods_byte_c);
- CPPUNIT_ASSERT(e.name() == "second");
+ void test_second_ctor()
+ {
+ D4Enum e("second", dods_byte_c);
+ CPPUNIT_ASSERT(e.d_element_type == dods_byte_c);
+ CPPUNIT_ASSERT(e.name() == "second");
}
// Tests bogus type name
- void test_second_ctor2() {
- D4Enum e("bogus", dods_str_c);
- CPPUNIT_ASSERT(e.d_element_type == dods_uint64_c);
- CPPUNIT_ASSERT(e.name() == "bogus");
+ void test_second_ctor2()
+ {
+ D4Enum e("bogus", dods_str_c);
+ CPPUNIT_ASSERT(e.d_element_type == dods_uint64_c);
+ CPPUNIT_ASSERT(e.name() == "bogus");
}
- void test_set_value() {
- D4Enum e("second", dods_byte_c);
- dods_byte db = 200;
- e.set_value(db);
- CPPUNIT_ASSERT(e.d_buf == 200);
+ void test_set_value()
+ {
+ D4Enum e("second", dods_byte_c);
+ dods_byte db = 200;
+ e.set_value(db);
+ CPPUNIT_ASSERT(e.d_buf == 200);
}
- void test_set_value2() {
- D4Enum e("second", dods_byte_c);
- e.set_value(200);
- CPPUNIT_ASSERT(e.d_buf == 200);
+ void test_set_value2()
+ {
+ D4Enum e("second", dods_byte_c);
+ e.set_value(200);
+ CPPUNIT_ASSERT(e.d_buf == 200);
}
- void test_set_value3() {
- D4Enum e("third", dods_int32_c);
- e.set_value(-65535);
- CPPUNIT_ASSERT(e.d_buf == -65535);
+ void test_set_value3()
+ {
+ D4Enum e("third", dods_int32_c);
+ e.set_value(-65535);
+ CPPUNIT_ASSERT(e.d_buf == -65535);
}
- void test_value() {
- D4Enum e("second", dods_byte_c);
- e.set_value(200);
- dods_byte db;
- e.value(&db);
- CPPUNIT_ASSERT(db == 200);
+ void test_value()
+ {
+ D4Enum e("second", dods_byte_c);
+ e.set_value(200);
+ dods_byte db;
+ e.value(&db);
+ CPPUNIT_ASSERT(db == 200);
}
- void test_value2() {
- D4Enum e("third", dods_int32_c);
- e.set_value(-65535);
- int32_t db;
- e.value(&db);
- CPPUNIT_ASSERT(db == -65535);
+ void test_value2()
+ {
+ D4Enum e("third", dods_int32_c);
+ e.set_value(-65535);
+ int32_t db;
+ e.value(&db);
+ CPPUNIT_ASSERT(db == -65535);
}
- void test_copy_ctor() {
- D4Enum e("second", dods_byte_c);
- e.set_value(200);
+ void test_copy_ctor()
+ {
+ D4Enum e("second", dods_byte_c);
+ e.set_value(200);
- D4Enum f(e);
- CPPUNIT_ASSERT(f.d_element_type == dods_byte_c);
- CPPUNIT_ASSERT(f.name() == "second");
- CPPUNIT_ASSERT(f.d_buf == 200);
+ D4Enum f(e);
+ CPPUNIT_ASSERT(f.d_element_type == dods_byte_c);
+ CPPUNIT_ASSERT(f.name() == "second");
+ CPPUNIT_ASSERT(f.d_buf == 200);
}
- void test_assignment() {
- D4Enum e("second", dods_byte_c);
- e.set_value(200);
+ void test_assignment()
+ {
+ D4Enum e("second", dods_byte_c);
+ e.set_value(200);
- D4Enum f = e;
- CPPUNIT_ASSERT(f.d_element_type == dods_byte_c);
- CPPUNIT_ASSERT(f.name() == "second");
- CPPUNIT_ASSERT(f.d_buf == 200);
+ D4Enum f = e;
+ CPPUNIT_ASSERT(f.d_element_type == dods_byte_c);
+ CPPUNIT_ASSERT(f.name() == "second");
+ CPPUNIT_ASSERT(f.d_buf == 200);
}
- void test_print() {
- D4Enum e("test", dods_byte_c);
+ void test_print()
+ {
+ D4Enum e("test", dods_byte_c);
D4EnumDef enum_def("Colors", dods_byte_c);
e.set_enumeration(&enum_def);
- e.set_value((dods_byte)200);
+ e.set_value((dods_byte) 200);
- XMLWriter xml;
+ XMLWriter xml;
e.print_dap4(xml);
string doc = xml.get_doc();
@@ -169,14 +186,15 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_val() {
- D4Enum e("test", dods_byte_c);
+ void test_print_val()
+ {
+ D4Enum e("test", dods_byte_c);
D4EnumDef enum_def("Colors", dods_byte_c);
e.set_enumeration(&enum_def);
- e.set_value(200);
+ e.set_value(200);
- ostringstream oss;
+ ostringstream oss;
e.print_val(oss, "", true);
string doc = oss.str();
@@ -186,52 +204,62 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- CPPUNIT_TEST_SUITE( D4EnumTest );
+ CPPUNIT_TEST_SUITE (D4EnumTest);
- CPPUNIT_TEST(test_first_ctor);
+ CPPUNIT_TEST (test_first_ctor);
#ifdef NDEBUG
- CPPUNIT_TEST(test_first_ctor2);
+ CPPUNIT_TEST(test_first_ctor2);
#endif
- CPPUNIT_TEST(test_second_ctor);
+ CPPUNIT_TEST (test_second_ctor);
#ifdef NDEBUG
- CPPUNIT_TEST(test_second_ctor2);
+ CPPUNIT_TEST(test_second_ctor2);
#endif
- CPPUNIT_TEST(test_set_value);
- CPPUNIT_TEST(test_set_value2);
- CPPUNIT_TEST(test_set_value3);
+ CPPUNIT_TEST (test_set_value);
+ CPPUNIT_TEST (test_set_value2);
+ CPPUNIT_TEST (test_set_value3);
- CPPUNIT_TEST(test_value);
- CPPUNIT_TEST(test_value2);
+ CPPUNIT_TEST (test_value);
+ CPPUNIT_TEST (test_value2);
- CPPUNIT_TEST(test_copy_ctor);
- CPPUNIT_TEST(test_assignment);
+ CPPUNIT_TEST (test_copy_ctor);
+ CPPUNIT_TEST (test_assignment);
- CPPUNIT_TEST(test_print);
- CPPUNIT_TEST(test_print_val);
+ CPPUNIT_TEST (test_print);
+ CPPUNIT_TEST (test_print_val);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(D4EnumTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (D4EnumTest);
}
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4EnumTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::D4EnumTest::suite()->getTests();
+ unsigned int prefix_len = libdap::D4EnumTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -240,9 +268,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::D4EnumTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::D4EnumTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/D4FilterClauseTest.cc b/unit-tests/D4FilterClauseTest.cc
index 27b52d2..b9a3023 100644
--- a/unit-tests/D4FilterClauseTest.cc
+++ b/unit-tests/D4FilterClauseTest.cc
@@ -67,8 +67,8 @@ using namespace std;
namespace libdap {
class D4FilterClauseTest: public TestFixture {
- // Build a DMR and build several D4RValue objects that reference its variables.
- // Then build several D4RValue objects that hold constants
+ // Build a DMR and build several D4RValue objects that reference its variables.
+ // Then build several D4RValue objects that hold constants
private:
Byte *byte;
@@ -79,12 +79,16 @@ private:
DMR dmr;
public:
- D4FilterClauseTest(): byte(0), f32(0), str(0), url(0) {
+ D4FilterClauseTest() :
+ byte(0), f32(0), str(0), url(0)
+ {
}
- ~D4FilterClauseTest() {
+ ~D4FilterClauseTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
byte = new Byte("byte");
byte->set_value(17);
@@ -98,87 +102,91 @@ public:
url->set_value("https://github.com/opendap");
}
- void tearDown() {
+ void tearDown()
+ {
delete byte;
delete str;
}
// FilterClauseList tests further down...
- void Byte_and_long_long_test() {
+ void Byte_and_long_long_test()
+ {
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((long long)21);
+ D4RValue *arg2 = new D4RValue((long long) 21);
auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value(dmr));
D4RValue *arg2_1 = new D4RValue(byte); // holds 17
- D4RValue *arg2_2 = new D4RValue((long long)21);
+ D4RValue *arg2_2 = new D4RValue((long long) 21);
auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
CPPUNIT_ASSERT(!greater->value(dmr));
D4RValue *arg3_1 = new D4RValue(byte); // holds 17
- D4RValue *arg3_2 = new D4RValue((long long)21);
+ D4RValue *arg3_2 = new D4RValue((long long) 21);
auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
CPPUNIT_ASSERT(!equal->value(dmr));
D4RValue *arg4_1 = new D4RValue(byte); // holds 17
- D4RValue *arg4_2 = new D4RValue((long long)21);
+ D4RValue *arg4_2 = new D4RValue((long long) 21);
auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
CPPUNIT_ASSERT(not_equal->value(dmr));
}
// This version uses the D4FilterClause::value() and not value(DMR&) method
- void Byte_and_long_long_test_2() {
+ void Byte_and_long_long_test_2()
+ {
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((long long)21);
+ D4RValue *arg2 = new D4RValue((long long) 21);
auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value());
D4RValue *arg2_1 = new D4RValue(byte); // holds 17
- D4RValue *arg2_2 = new D4RValue((long long)21);
+ D4RValue *arg2_2 = new D4RValue((long long) 21);
auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
CPPUNIT_ASSERT(!greater->value());
D4RValue *arg3_1 = new D4RValue(byte); // holds 17
- D4RValue *arg3_2 = new D4RValue((long long)21);
+ D4RValue *arg3_2 = new D4RValue((long long) 21);
auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
CPPUNIT_ASSERT(!equal->value());
D4RValue *arg4_1 = new D4RValue(byte); // holds 17
- D4RValue *arg4_2 = new D4RValue((long long)21);
+ D4RValue *arg4_2 = new D4RValue((long long) 21);
auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
CPPUNIT_ASSERT(not_equal->value());
}
- void Byte_and_double_test() {
+ void Byte_and_double_test()
+ {
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((double)21.0);
+ D4RValue *arg2 = new D4RValue((double) 21.0);
auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value(dmr));
D4RValue *arg2_1 = new D4RValue(byte); // holds 17
- D4RValue *arg2_2 = new D4RValue((double)21);
+ D4RValue *arg2_2 = new D4RValue((double) 21);
auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
CPPUNIT_ASSERT(!greater->value(dmr));
D4RValue *arg3_1 = new D4RValue(byte); // holds 17
- D4RValue *arg3_2 = new D4RValue((double)21);
+ D4RValue *arg3_2 = new D4RValue((double) 21);
auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
CPPUNIT_ASSERT(!equal->value(dmr));
D4RValue *arg4_1 = new D4RValue(byte); // holds 17
- D4RValue *arg4_2 = new D4RValue((double)21);
+ D4RValue *arg4_2 = new D4RValue((double) 21);
auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
CPPUNIT_ASSERT(not_equal->value(dmr));
@@ -187,18 +195,20 @@ public:
/** @defgroup type_conv Tests for type promotion
* @{
*/
- void Byte_and_int_test() {
+ void Byte_and_int_test()
+ {
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((unsigned long long)(21));
+ D4RValue *arg2 = new D4RValue((unsigned long long) (21));
auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value());
}
- void Byte_and_float_test() {
+ void Byte_and_float_test()
+ {
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((float)21.0);
+ D4RValue *arg2 = new D4RValue((float) 21.0);
auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value());
@@ -207,7 +217,8 @@ public:
/** @} */
// this uses a mix of value() and value(dmr), just for cover both cases
- void Str_and_str_test() {
+ void Str_and_str_test()
+ {
D4RValue *arg1 = new D4RValue(str);
D4RValue *arg2 = new D4RValue(string("Tesla"));
@@ -233,7 +244,8 @@ public:
CPPUNIT_ASSERT(not_equal->value(dmr));
}
- void Str_and_match_test() {
+ void Str_and_match_test()
+ {
D4RValue *arg1 = new D4RValue(str);
D4RValue *arg2 = new D4RValue(string("E.*n"));
@@ -338,7 +350,8 @@ public:
}
// test Url and Float32
- void grab_bag_test() {
+ void grab_bag_test()
+ {
D4RValue *arg2_1 = new D4RValue(f32);
D4RValue *arg2_2 = new D4RValue(17.0);
@@ -364,7 +377,8 @@ public:
CPPUNIT_ASSERT(match->value(dmr));
}
- void float_test() {
+ void float_test()
+ {
D4RValue *arg2_1 = new D4RValue(f32);
D4RValue *arg2_2 = new D4RValue(3.1415);
@@ -372,7 +386,8 @@ public:
CPPUNIT_ASSERT(clause->value());
}
- void float_test_2() {
+ void float_test_2()
+ {
D4RValue *arg2_1 = new D4RValue(f32);
D4RValue *arg2_2 = new D4RValue(3.1415);
@@ -380,7 +395,8 @@ public:
CPPUNIT_ASSERT(clause->value());
}
- void float_test_3() {
+ void float_test_3()
+ {
D4RValue *arg2_1 = new D4RValue(f32);
D4RValue *arg2_2 = new D4RValue(3.1415);
@@ -388,23 +404,24 @@ public:
CPPUNIT_ASSERT(clause->value());
}
- void int_test() {
+ void int_test()
+ {
auto_ptr<Int8> i8(new Int8(""));
i8->set_value(17);
D4RValue *arg2_1 = new D4RValue(i8.get());
- D4RValue *arg2_2 = new D4RValue((long long)17);
+ D4RValue *arg2_2 = new D4RValue((long long) 17);
auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
CPPUNIT_ASSERT(clause->value());
}
-
- void true_clauses_test() {
+ void true_clauses_test()
+ {
// Testing this as a pointer since that's how it will be stored in D4Sequence
auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
D4RValue *arg1_1 = new D4RValue(byte); // holds 17
- D4RValue *arg1_2 = new D4RValue((double)21.0);
+ D4RValue *arg1_2 = new D4RValue((double) 21.0);
clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg1_1, arg1_2));
D4RValue *arg2_1 = new D4RValue(f32); // holds pi
@@ -425,7 +442,8 @@ public:
}
// This should return true
- void no_clauses_test() {
+ void no_clauses_test()
+ {
auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
CPPUNIT_ASSERT(clauses->size() == 0);
@@ -433,11 +451,12 @@ public:
CPPUNIT_ASSERT(clauses->value());
}
- void false_clauses_test() {
+ void false_clauses_test()
+ {
auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
D4RValue *arg1_1 = new D4RValue(byte); // holds 17
- D4RValue *arg1_2 = new D4RValue((double)21.0);
+ D4RValue *arg1_2 = new D4RValue((double) 21.0);
clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg1_1, arg1_2));
// This clause will fail
@@ -458,11 +477,12 @@ public:
CPPUNIT_ASSERT(clauses->value() == false);
}
- void evaluation_order_test() {
+ void evaluation_order_test()
+ {
auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
D4RValue *arg1_1 = new D4RValue(byte); // holds 17
- D4RValue *arg1_2 = new D4RValue((double)21.0);
+ D4RValue *arg1_2 = new D4RValue((double) 21.0);
clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg1_1, arg1_2));
// This clause will fail and we should not get to the next clause, which will
@@ -491,11 +511,12 @@ public:
}
}
- void evaluation_order_test_2() {
+ void evaluation_order_test_2()
+ {
auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
D4RValue *arg1_1 = new D4RValue(byte); // holds 17
- D4RValue *arg1_2 = new D4RValue((double)21.0);
+ D4RValue *arg1_2 = new D4RValue((double) 21.0);
clauses->add_clause(new D4FilterClause(D4FilterClause::less, arg1_1, arg1_2));
// This clause will *pass* and we *should* get to the next clause, which will
@@ -524,48 +545,46 @@ public:
}
}
- CPPUNIT_TEST_SUITE( D4FilterClauseTest );
+ CPPUNIT_TEST_SUITE (D4FilterClauseTest);
- CPPUNIT_TEST(Byte_and_long_long_test);
- CPPUNIT_TEST(Byte_and_long_long_test_2);
- CPPUNIT_TEST(Byte_and_double_test);
+ CPPUNIT_TEST (Byte_and_long_long_test);
+ CPPUNIT_TEST (Byte_and_long_long_test_2);
+ CPPUNIT_TEST (Byte_and_double_test);
// These float --> double, etc.
- CPPUNIT_TEST(Byte_and_int_test);
- CPPUNIT_TEST(Byte_and_float_test);
-
- CPPUNIT_TEST(Str_and_str_test);
- CPPUNIT_TEST(Str_and_match_test);
- CPPUNIT_TEST(Str_and_number_error_test);
- CPPUNIT_TEST(Byte_and_string_error_test);
- CPPUNIT_TEST(Structure_and_string_error_test);
- CPPUNIT_TEST(Byte_and_Structure_error_test);
- CPPUNIT_TEST(Str_and_Structure_error_test);
-
- CPPUNIT_TEST(grab_bag_test);
- CPPUNIT_TEST(float_test);
- CPPUNIT_TEST(float_test_2);
- CPPUNIT_TEST(float_test_3);
- CPPUNIT_TEST(int_test);
+ CPPUNIT_TEST (Byte_and_int_test);
+ CPPUNIT_TEST (Byte_and_float_test);
+
+ CPPUNIT_TEST (Str_and_str_test);
+ CPPUNIT_TEST (Str_and_match_test);
+ CPPUNIT_TEST (Str_and_number_error_test);
+ CPPUNIT_TEST (Byte_and_string_error_test);
+ CPPUNIT_TEST (Structure_and_string_error_test);
+ CPPUNIT_TEST (Byte_and_Structure_error_test);
+ CPPUNIT_TEST (Str_and_Structure_error_test);
+
+ CPPUNIT_TEST (grab_bag_test);
+ CPPUNIT_TEST (float_test);
+ CPPUNIT_TEST (float_test_2);
+ CPPUNIT_TEST (float_test_3);
+ CPPUNIT_TEST (int_test);
// FilterClauseList tests
- CPPUNIT_TEST(true_clauses_test);
- CPPUNIT_TEST(no_clauses_test);
- CPPUNIT_TEST(false_clauses_test);
- CPPUNIT_TEST(evaluation_order_test);
- CPPUNIT_TEST(evaluation_order_test_2);
+ CPPUNIT_TEST (true_clauses_test);
+ CPPUNIT_TEST (no_clauses_test);
+ CPPUNIT_TEST (false_clauses_test);
+ CPPUNIT_TEST (evaluation_order_test);
+ CPPUNIT_TEST (evaluation_order_test_2);
CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(D4FilterClauseTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (D4FilterClauseTest);
} // namepsace libdap
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != EOF)
@@ -573,10 +592,22 @@ int main(int argc, char*argv[]) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4FilterClauseTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::D4FilterClauseTest::suite()->getTests();
+ unsigned int prefix_len = libdap::D4FilterClauseTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -585,15 +616,13 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::D4FilterClauseTest::") + argv[i++];
- DBG(cerr << "test: " << test << endl);
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::D4FilterClauseTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
- // xmlMemoryDump();
-
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/D4GroupTest.cc b/unit-tests/D4GroupTest.cc
index a11aca5..b5f0680 100644
--- a/unit-tests/D4GroupTest.cc
+++ b/unit-tests/D4GroupTest.cc
@@ -28,8 +28,6 @@
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/extensions/HelperMacros.h>
-//#define DODS_DEBUG 1
-
#include "D4Group.h"
#include "D4Attributes.h"
@@ -59,48 +57,57 @@ private:
D4Group *root, *named;
public:
- D4GroupTest() : xml(0), root(0), named(0) {
+ D4GroupTest() :
+ xml(0), root(0), named(0)
+ {
}
- ~D4GroupTest() {
+ ~D4GroupTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
root = new D4Group("/");
named = new D4Group("test");
xml = new XMLWriter;
}
- void tearDown() {
+ void tearDown()
+ {
delete xml;
delete root;
delete named;
}
- void load_group_with_scalars(D4Group *g) {
+ void load_group_with_scalars(D4Group *g)
+ {
g->add_var_nocopy(new Byte("b"));
g->add_var_nocopy(new Int64("i64"));
}
- void load_group_with_constructors_and_scalars(D4Group *g) {
- Structure *s = new Structure("s");
- s->add_var_nocopy(new Byte("b"));
- s->add_var_nocopy(new Int64("i64"));
- g->add_var_nocopy(s);
+ void load_group_with_constructors_and_scalars(D4Group *g)
+ {
+ Structure *s = new Structure("s");
+ s->add_var_nocopy(new Byte("b"));
+ s->add_var_nocopy(new Int64("i64"));
+ g->add_var_nocopy(s);
}
- void load_group_with_nested_constructors_and_scalars(D4Group *g) {
- Structure *c = new Structure("c");
- c->add_var_nocopy(new Byte("b"));
- c->add_var_nocopy(new Int64("i64"));
+ void load_group_with_nested_constructors_and_scalars(D4Group *g)
+ {
+ Structure *c = new Structure("c");
+ c->add_var_nocopy(new Byte("b"));
+ c->add_var_nocopy(new Int64("i64"));
- Structure *p = new Structure("p");
- p->add_var_nocopy(c);
+ Structure *p = new Structure("p");
+ p->add_var_nocopy(c);
- g->add_var_nocopy(p);
+ g->add_var_nocopy(p);
}
- void load_group_with_stuff(D4Group *g) {
+ void load_group_with_stuff(D4Group *g)
+ {
g->dims()->add_dim_nocopy(new D4Dimension("lat", 1024));
g->dims()->add_dim_nocopy(new D4Dimension("lon", 1024));
g->dims()->add_dim_nocopy(new D4Dimension("time", 20));
@@ -118,7 +125,8 @@ public:
// An empty D4Group object prints nothing; the XMLWriter class adds
// a xml doc preface.
- void test_print_empty() {
+ void test_print_empty()
+ {
root->print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_empty.xml");
@@ -127,7 +135,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_named_empty() {
+ void test_print_named_empty()
+ {
named->print_dap4(*xml);
string doc = xml->get_doc();
string baseline = readTestBaseline(string(TEST_SRC_DIR) + "/D4-xml/D4Group_named_empty.xml");
@@ -136,7 +145,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_with_vars() {
+ void test_print_with_vars()
+ {
load_group_with_scalars(root);
root->print_dap4(*xml);
@@ -147,7 +157,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_named_with_vars() {
+ void test_print_named_with_vars()
+ {
load_group_with_scalars(named);
named->print_dap4(*xml);
@@ -159,7 +170,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_with_vars_and_stuff() {
+ void test_print_with_vars_and_stuff()
+ {
load_group_with_scalars(root);
load_group_with_stuff(root);
@@ -171,7 +183,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_named_with_vars_and_stuff() {
+ void test_print_named_with_vars_and_stuff()
+ {
load_group_with_scalars(named);
load_group_with_stuff(named);
@@ -183,7 +196,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_find_var() {
+ void test_find_var()
+ {
load_group_with_scalars(root);
load_group_with_stuff(root);
@@ -210,7 +224,8 @@ public:
CPPUNIT_ASSERT(btp->get_parent()->name() == "child" && btp->get_parent()->get_parent()->name() == "/");
}
- void test_print_everything() {
+ void test_print_everything()
+ {
load_group_with_scalars(root);
load_group_with_stuff(root);
@@ -232,7 +247,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_copy_ctor() {
+ void test_print_copy_ctor()
+ {
load_group_with_scalars(root);
load_group_with_stuff(root);
@@ -251,7 +267,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_print_assignment() {
+ void test_print_assignment()
+ {
load_group_with_scalars(root);
load_group_with_stuff(root);
@@ -270,7 +287,8 @@ public:
CPPUNIT_ASSERT(doc == baseline);
}
- void test_fqn_1() {
+ void test_fqn_1()
+ {
load_group_with_scalars(root);
BaseType *btp = root->find_var("b");
@@ -278,7 +296,8 @@ public:
CPPUNIT_ASSERT(btp->FQN() == "/b");
}
- void test_fqn_2() {
+ void test_fqn_2()
+ {
load_group_with_constructors_and_scalars(root);
BaseType *btp = root->find_var("s.b");
@@ -286,11 +305,12 @@ public:
CPPUNIT_ASSERT(btp->FQN() == "/s.b");
btp = root->find_var("/s.b");
- DBG(cerr << "test_fqn_2: " << btp->FQN() << endl);
- CPPUNIT_ASSERT(btp->FQN() == "/s.b");
+ DBG(cerr << "test_fqn_2: " << btp->FQN() << endl);
+ CPPUNIT_ASSERT(btp->FQN() == "/s.b");
}
- void test_fqn_3() {
+ void test_fqn_3()
+ {
load_group_with_nested_constructors_and_scalars(root);
BaseType *btp = root->find_var("p.c.b");
@@ -298,12 +318,13 @@ public:
CPPUNIT_ASSERT(btp->FQN() == "/p.c.b");
btp = root->find_var("/p.c.b");
- DBG(cerr << "test_fqn_3: " << btp->FQN() << endl);
- CPPUNIT_ASSERT(btp->FQN() == "/p.c.b");
+ DBG(cerr << "test_fqn_3: " << btp->FQN() << endl);
+ CPPUNIT_ASSERT(btp->FQN() == "/p.c.b");
}
- void test_fqn_4() {
- D4Group *local = new D4Group("child");
+ void test_fqn_4()
+ {
+ D4Group *local = new D4Group("child");
load_group_with_nested_constructors_and_scalars(local);
root->add_group_nocopy(local);
@@ -312,51 +333,58 @@ public:
CPPUNIT_ASSERT(btp && btp->FQN() == "/child/p.c.b");
btp = root->find_var("/child/p.c.b");
- DBG(cerr << "test_fqn_4: " << btp->FQN() << endl);
- CPPUNIT_ASSERT(btp && btp->FQN() == "/child/p.c.b");
+ DBG(cerr << "test_fqn_4: " << btp->FQN() << endl);
+ CPPUNIT_ASSERT(btp && btp->FQN() == "/child/p.c.b");
}
- CPPUNIT_TEST_SUITE( D4GroupTest );
+ CPPUNIT_TEST_SUITE (D4GroupTest);
- CPPUNIT_TEST(test_print_empty);
+ CPPUNIT_TEST (test_print_empty);
- CPPUNIT_TEST(test_print_named_empty);
- CPPUNIT_TEST(test_print_with_vars);
- CPPUNIT_TEST(test_print_named_with_vars);
+ CPPUNIT_TEST (test_print_named_empty);
+ CPPUNIT_TEST (test_print_with_vars);
+ CPPUNIT_TEST (test_print_named_with_vars);
- CPPUNIT_TEST(test_print_with_vars_and_stuff);
+ CPPUNIT_TEST (test_print_with_vars_and_stuff);
- CPPUNIT_TEST(test_print_named_with_vars_and_stuff);
- CPPUNIT_TEST(test_print_everything);
+ CPPUNIT_TEST (test_print_named_with_vars_and_stuff);
+ CPPUNIT_TEST (test_print_everything);
- CPPUNIT_TEST(test_find_var);
+ CPPUNIT_TEST (test_find_var);
- CPPUNIT_TEST(test_print_copy_ctor);
- CPPUNIT_TEST(test_print_assignment);
+ CPPUNIT_TEST (test_print_copy_ctor);
+ CPPUNIT_TEST (test_print_assignment);
- CPPUNIT_TEST(test_fqn_1);
- CPPUNIT_TEST(test_fqn_2);
- CPPUNIT_TEST(test_fqn_3);
- CPPUNIT_TEST(test_fqn_4);
+ CPPUNIT_TEST (test_fqn_1);
+ CPPUNIT_TEST (test_fqn_2);
+ CPPUNIT_TEST (test_fqn_3);
+ CPPUNIT_TEST (test_fqn_4);
CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(D4GroupTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (D4GroupTest);
-int
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
- GetOpt getopt(argc, argv, "d");
+ GetOpt getopt(argc, argv, "dh");
int option_char;
-
while ((option_char = getopt()) != -1)
switch (option_char) {
- case 'd':
- debug = 1; // debug is a static global
- break;
- default:
- break;
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4GroupTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = D4GroupTest::suite()->getTests();
+ unsigned int prefix_len = D4GroupTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
}
CppUnit::TextTestRunner runner;
@@ -370,10 +398,9 @@ main(int argc, char *argv[])
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("D4GroupTest::") + argv[i++];
- if (debug)
- cerr << "Running " << test << endl;
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = D4GroupTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/D4MarshallerTest.cc b/unit-tests/D4MarshallerTest.cc
index e066ea0..89b1150 100644
--- a/unit-tests/D4MarshallerTest.cc
+++ b/unit-tests/D4MarshallerTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -59,33 +58,34 @@ static bool write_baselines = false;
#if WORDS_BIGENDIAN
const static string path = (string)TEST_SRC_DIR + "/D4-marshaller/big-endian";
#else
-const static string path = (string)TEST_SRC_DIR + "/D4-marshaller/little-endian";
+const static string path = (string) TEST_SRC_DIR + "/D4-marshaller/little-endian";
#endif
using namespace std;
using namespace libdap;
+using namespace CppUnit;
class D4MarshallerTest: public CppUnit::TestFixture {
- CPPUNIT_TEST_SUITE( D4MarshallerTest );
+ CPPUNIT_TEST_SUITE (D4MarshallerTest);
- CPPUNIT_TEST(test_cmp);
- CPPUNIT_TEST(test_scalars);
- CPPUNIT_TEST(test_real_scalars);
- CPPUNIT_TEST(test_str);
- CPPUNIT_TEST(test_opaque);
- CPPUNIT_TEST(test_vector);
+ CPPUNIT_TEST (test_cmp);
+ CPPUNIT_TEST (test_scalars);
+ CPPUNIT_TEST (test_real_scalars);
+ CPPUNIT_TEST (test_str);
+ CPPUNIT_TEST (test_opaque);
+ CPPUNIT_TEST (test_vector);
CPPUNIT_TEST_SUITE_END( );
/**
* Compare the contents of a file with a memory buffer
*/
- bool cmp(const char *buf, unsigned int len, string file) {
+ bool cmp(const char *buf, unsigned int len, string file)
+ {
fstream in;
in.open(file.c_str(), fstream::binary | fstream::in);
- if (!in)
- throw Error("Could not open file: " + file);
+ if (!in) throw Error("Could not open file: " + file);
vector<char> fbuf(len);
in.read(&fbuf[0], len);
@@ -98,84 +98,90 @@ class D4MarshallerTest: public CppUnit::TestFixture {
for (unsigned int i = 0; i < len; ++i)
if (buf[i] != fbuf[i]) {
DBG(cerr << "Response differs from baseline at byte " << i << endl);
- DBG(cerr << "Expected: " << setfill('0') << setw(2) << hex
- << (unsigned int)fbuf[i] << "; got: "
- << (unsigned int)buf[i] << dec << endl);
+ DBG(
+ cerr << "Expected: " << setfill('0') << setw(2) << hex << (unsigned int )fbuf[i] << "; got: "
+ << (unsigned int )buf[i] << dec << endl);
return false;
}
return true;
}
- void write_binary_file(const char *buf, int len, string file) {
+ void write_binary_file(const char *buf, int len, string file)
+ {
fstream out;
out.open(file.c_str(), fstream::binary | fstream::out);
- if (!out)
- throw Error("Could not open file: " + file);
+ if (!out) throw Error("Could not open file: " + file);
out.write(buf, len);
}
public:
- D4MarshallerTest() {
+ D4MarshallerTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
}
- void tearDown() {
+ void tearDown()
+ {
}
- void test_cmp() {
+ void test_cmp()
+ {
char buf[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
- DBG(cerr << "Path: " << path << endl);
+ DBG(cerr << "Path: " << path << endl);
CPPUNIT_ASSERT(cmp(buf, 16, path + "/test_cmp.dat"));
}
- void test_scalars() {
+ void test_scalars()
+ {
ostringstream oss;
// computes checksums and writes data
try {
- D4StreamMarshaller dsm(oss);
-
- dsm.reset_checksum();
-
- dsm.put_byte(17);
- dsm.put_checksum();
- DBG(cerr << "test_scalars: checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
-
- dsm.put_int16(17);
- dsm.put_checksum();
- DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
-
- dsm.put_int32(17);
- dsm.put_checksum();
- DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
-
- dsm.put_int64(17);
- dsm.put_checksum();
- DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
-
- dsm.put_uint16(17);
- dsm.put_checksum();
- DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
-
- dsm.put_uint32(17);
- dsm.put_checksum();
- DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
-
- dsm.put_uint64(17);
- dsm.put_checksum();
- DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
-
- if (write_baselines) write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_1_bin.dat");
- CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_scalars_1_bin.dat"));
+ D4StreamMarshaller dsm(oss);
+
+ dsm.reset_checksum();
+
+ dsm.put_byte(17);
+ dsm.put_checksum();
+ DBG(cerr << "test_scalars: checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
+
+ dsm.put_int16(17);
+ dsm.put_checksum();
+ DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
+
+ dsm.put_int32(17);
+ dsm.put_checksum();
+ DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
+
+ dsm.put_int64(17);
+ dsm.put_checksum();
+ DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
+
+ dsm.put_uint16(17);
+ dsm.put_checksum();
+ DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
+
+ dsm.put_uint32(17);
+ dsm.put_checksum();
+ DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
+
+ dsm.put_uint64(17);
+ dsm.put_checksum();
+ DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
+
+ if (write_baselines)
+ write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_1_bin.dat");
+ CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_scalars_1_bin.dat"));
}
catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
@@ -183,26 +189,28 @@ public:
}
}
- void test_real_scalars() {
+ void test_real_scalars()
+ {
ostringstream oss;
// computes checksums and writes data
try {
- D4StreamMarshaller dsm(oss);
+ D4StreamMarshaller dsm(oss);
- dsm.reset_checksum();
+ dsm.reset_checksum();
- dsm.put_float32(17);
- dsm.put_checksum();
- DBG(cerr << "test_real_scalars: checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
+ dsm.put_float32(17);
+ dsm.put_checksum();
+ DBG(cerr << "test_real_scalars: checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
- dsm.put_float64(17);
- dsm.put_checksum();
- DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
- dsm.reset_checksum();
+ dsm.put_float64(17);
+ dsm.put_checksum();
+ DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
+ dsm.reset_checksum();
- if (write_baselines) write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_2_bin.dat");
- CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_scalars_2_bin.dat"));
+ if (write_baselines)
+ write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_2_bin.dat");
+ CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_scalars_2_bin.dat"));
}
catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
@@ -210,7 +218,8 @@ public:
}
}
- void test_str() {
+ void test_str()
+ {
ostringstream oss;
try {
D4StreamMarshaller dsm(oss);
@@ -229,16 +238,18 @@ public:
dsm.reset_checksum();
// True these are not really scalars...
- if (write_baselines) write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_3_bin.dat");
+ if (write_baselines)
+ write_binary_file(oss.str().data(), oss.str().length(), path + "/test_scalars_3_bin.dat");
CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_scalars_3_bin.dat"));
- }
+ }
catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Caught an exception.");
}
}
- void test_opaque() {
+ void test_opaque()
+ {
ostringstream oss;
try {
D4StreamMarshaller dsm(oss);
@@ -253,16 +264,18 @@ public:
DBG(cerr << "test_opaque: checksum: " << dsm.get_checksum() << endl);
dsm.reset_checksum();
- if (write_baselines) write_binary_file(oss.str().data(), oss.str().length(), path + "/test_opaque_1_bin.dat");
+ if (write_baselines)
+ write_binary_file(oss.str().data(), oss.str().length(), path + "/test_opaque_1_bin.dat");
CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_opaque_1_bin.dat"));
- }
+ }
catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Caught an exception.");
}
}
- void test_vector() {
+ void test_vector()
+ {
ostringstream oss;
try {
D4StreamMarshaller dsm(oss);
@@ -294,9 +307,10 @@ public:
dsm.put_checksum();
DBG(cerr << "checksum: " << dsm.get_checksum() << endl);
- if (write_baselines) write_binary_file(oss.str().data(), oss.str().length(), path + "/test_vector_1_bin.dat");
+ if (write_baselines)
+ write_binary_file(oss.str().data(), oss.str().length(), path + "/test_vector_1_bin.dat");
CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_vector_1_bin.dat"));
- }
+ }
catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Caught an exception.");
@@ -309,7 +323,7 @@ public:
D4StreamMarshaller dsm(oss);
vector<unsigned char> buf1(32768);
for (int i = 0; i < 32768; ++i)
- buf1[i] = i % (1 << 7);
+ buf1[i] = i % (1 << 7);
dsm.reset_checksum();
@@ -320,7 +334,7 @@ public:
vector<dods_int32> buf2(32768);
for (int i = 0; i < 32768; ++i)
- buf2[i] = i % (1 << 9);
+ buf2[i] = i % (1 << 9);
dsm.put_varying_vector(reinterpret_cast<char*>(&buf2[0]), 32768, sizeof(dods_int32));
dsm.put_checksum();
@@ -329,7 +343,7 @@ public:
vector<dods_float64> buf3(32768);
for (int i = 0; i < 32768; ++i)
- buf3[i] = i % (1 << 9);
+ buf3[i] = i % (1 << 9);
dsm.put_varying_vector(reinterpret_cast<char*>(&buf3[0]), 32768, sizeof(dods_float64), dods_float64_c);
dsm.put_checksum();
@@ -337,7 +351,7 @@ public:
if (write_baselines) write_binary_file(oss.str().data(), oss.str().length(), path + "/test_vector_2_bin.dat");
CPPUNIT_ASSERT(cmp(oss.str().data(), oss.str().length(), path + "/test_vector_2_bin.dat"));
- }
+ }
catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Caught an exception.");
@@ -346,14 +360,11 @@ public:
#endif
};
-CPPUNIT_TEST_SUITE_REGISTRATION( D4MarshallerTest ) ;
-
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr));
+CPPUNIT_TEST_SUITE_REGISTRATION (D4MarshallerTest);
- GetOpt getopt(argc, argv, "dw");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dwh");
int option_char;
while ((option_char = getopt()) != -1)
@@ -364,10 +375,22 @@ int main(int argc, char*argv[]) {
case 'w':
write_baselines = true;
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4MarshallerTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = D4MarshallerTest::suite()->getTests();
+ unsigned int prefix_len = D4MarshallerTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -376,9 +399,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("D4MarshallerTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = D4MarshallerTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/D4ParserSax2Test.cc b/unit-tests/D4ParserSax2Test.cc
index 4606bea..59c8491 100644
--- a/unit-tests/D4ParserSax2Test.cc
+++ b/unit-tests/D4ParserSax2Test.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -61,7 +60,7 @@ static bool parser_debug = false;
#undef DBG
#define DBG(x) do { if (debug) (x); } while(false);
-class D4ParserSax2Test : public TestFixture {
+class D4ParserSax2Test: public TestFixture {
private:
D4ParserSax2 *parser;
DMR *dmr;
@@ -69,17 +68,24 @@ private:
XMLWriter *xml;
public:
- D4ParserSax2Test() : parser(0), dmr(0), btf(0), xml(0) {}
- ~D4ParserSax2Test() {}
+ D4ParserSax2Test() :
+ parser(0), dmr(0), btf(0), xml(0)
+ {
+ }
+ ~D4ParserSax2Test()
+ {
+ }
- void setUp() {
+ void setUp()
+ {
parser = new D4ParserSax2();
btf = new D4BaseTypeFactory;
dmr = new DMR(btf);
xml = new XMLWriter(" ");
}
- void tearDown() {
+ void tearDown()
+ {
delete parser;
delete dmr;
delete btf;
@@ -91,8 +97,7 @@ public:
try {
string name = string(TEST_SRC_DIR) + src;
ifstream ifile(name.c_str(), ifstream::in);
- if (!ifile)
- throw InternalErr(__FILE__, __LINE__, "Could not open file: " + src);
+ if (!ifile) throw InternalErr(__FILE__, __LINE__, "Could not open file: " + src);
parser->intern(ifile, dmr, parser_debug);
@@ -296,54 +301,52 @@ public:
CPPUNIT_ASSERT((*m)->parent() == b1);
}
- CPPUNIT_TEST_SUITE( D4ParserSax2Test );
-
- CPPUNIT_TEST(test_empty_dmr);
- CPPUNIT_TEST(test_dimension_def);
- CPPUNIT_TEST(test_attribute_def);
- CPPUNIT_TEST(test_nested_attribute_def);
- CPPUNIT_TEST(test_enum_def);
- CPPUNIT_TEST(test_enum_def2);
- CPPUNIT_TEST(test_simple_var_def);
- CPPUNIT_TEST(test_simple_var_with_attributes_def);
- CPPUNIT_TEST(test_array_var_def);
- CPPUNIT_TEST(test_array_var_def2);
- CPPUNIT_TEST(test_array_var_def3);
- CPPUNIT_TEST(test_array_var_def4);
- CPPUNIT_TEST(test_all_simple_var_def);
- CPPUNIT_TEST(test_opaque_var_def);
-
- CPPUNIT_TEST(test_structure_def);
- CPPUNIT_TEST(test_structure_with_attributes_def);
- CPPUNIT_TEST(test_group_def);
- CPPUNIT_TEST(test_group_with_attributes_def);
- CPPUNIT_TEST(test_group_with_enums_def);
-
- CPPUNIT_TEST(test_empty_dmr_string_version);
- CPPUNIT_TEST(test_attribute_def_string_version);
- CPPUNIT_TEST(test_group_with_attributes_def_string_version);
- CPPUNIT_TEST(test_structure_with_attributes_def_string_version);
- CPPUNIT_TEST(test_array_var_def4_string_version);
-
- CPPUNIT_TEST(test_array_1);
- CPPUNIT_TEST(test_array_2);
- CPPUNIT_TEST(test_array_3);
- CPPUNIT_TEST(test_array_4);
- CPPUNIT_TEST(test_array_5);
- CPPUNIT_TEST(test_array_6);
-
- CPPUNIT_TEST(test_map_1);
+ CPPUNIT_TEST_SUITE (D4ParserSax2Test);
+
+ CPPUNIT_TEST (test_empty_dmr);
+ CPPUNIT_TEST (test_dimension_def);
+ CPPUNIT_TEST (test_attribute_def);
+ CPPUNIT_TEST (test_nested_attribute_def);
+ CPPUNIT_TEST (test_enum_def);
+ CPPUNIT_TEST (test_enum_def2);
+ CPPUNIT_TEST (test_simple_var_def);
+ CPPUNIT_TEST (test_simple_var_with_attributes_def);
+ CPPUNIT_TEST (test_array_var_def);
+ CPPUNIT_TEST (test_array_var_def2);
+ CPPUNIT_TEST (test_array_var_def3);
+ CPPUNIT_TEST (test_array_var_def4);
+ CPPUNIT_TEST (test_all_simple_var_def);
+ CPPUNIT_TEST (test_opaque_var_def);
+
+ CPPUNIT_TEST (test_structure_def);
+ CPPUNIT_TEST (test_structure_with_attributes_def);
+ CPPUNIT_TEST (test_group_def);
+ CPPUNIT_TEST (test_group_with_attributes_def);
+ CPPUNIT_TEST (test_group_with_enums_def);
+
+ CPPUNIT_TEST (test_empty_dmr_string_version);
+ CPPUNIT_TEST (test_attribute_def_string_version);
+ CPPUNIT_TEST (test_group_with_attributes_def_string_version);
+ CPPUNIT_TEST (test_structure_with_attributes_def_string_version);
+ CPPUNIT_TEST (test_array_var_def4_string_version);
+
+ CPPUNIT_TEST (test_array_1);
+ CPPUNIT_TEST (test_array_2);
+ CPPUNIT_TEST (test_array_3);
+ CPPUNIT_TEST (test_array_4);
+ CPPUNIT_TEST (test_array_5);
+ CPPUNIT_TEST (test_array_6);
+
+ CPPUNIT_TEST (test_map_1);
CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION( D4ParserSax2Test );
-
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+CPPUNIT_TEST_SUITE_REGISTRATION (D4ParserSax2Test);
- GetOpt getopt(argc, argv, "dp");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dph");
int option_char;
while ((option_char = getopt()) != -1)
@@ -352,12 +355,24 @@ int main(int argc, char*argv[]) {
debug = 1; // debug is a static global
break;
case 'p':
- parser_debug = true;
- break;
+ parser_debug = true;
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4ParserSax2Test has the following tests:" << endl;
+ const std::vector<Test*> &tests = D4ParserSax2Test::suite()->getTests();
+ unsigned int prefix_len = D4ParserSax2Test::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -366,9 +381,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("D4ParserSax2Test::") + argv[i++];
- DBG(cerr << "test: " << test << endl);
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = D4ParserSax2Test::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/D4SequenceTest.cc b/unit-tests/D4SequenceTest.cc
index 0ffa254..9c5aaf2 100644
--- a/unit-tests/D4SequenceTest.cc
+++ b/unit-tests/D4SequenceTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -66,18 +65,23 @@ const static string s_txt = "TestD4Sequence_s.txt";
const static string one_clause_txt = "TestD4Sequence_one_clause.txt";
const static string two_clause_txt = "TestD4Sequence_two_clause.txt";
-namespace libdap
-{
+namespace libdap {
-class D4SequenceTest : public TestFixture {
+class D4SequenceTest: public TestFixture {
private:
TestD4Sequence *s;
public:
- D4SequenceTest() : s(0) {}
- ~D4SequenceTest() {}
+ D4SequenceTest() :
+ s(0)
+ {
+ }
+ ~D4SequenceTest()
+ {
+ }
- void setUp() {
+ void setUp()
+ {
// Set up a simple sequence. Used to test ctor, assigment, et cetera.
s = new TestD4Sequence("s");
s->add_var_nocopy(new TestInt32("i32"));
@@ -88,11 +92,14 @@ public:
s->set_length(7);
}
- void tearDown() {
- delete s; s = 0;
+ void tearDown()
+ {
+ delete s;
+ s = 0;
}
- void ctor_test() {
+ void ctor_test()
+ {
s->intern_data();
CPPUNIT_ASSERT(s->length() == 7);
@@ -105,7 +112,8 @@ public:
CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + s_txt));
}
- void assignment_test() {
+ void assignment_test()
+ {
TestD4Sequence ts = *s;
ts.intern_data();
CPPUNIT_ASSERT(ts.length() == 7);
@@ -117,7 +125,8 @@ public:
//CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + s_txt));
}
- void copy_ctor_test() {
+ void copy_ctor_test()
+ {
auto_ptr<TestD4Sequence> ts(new TestD4Sequence(*s));
ts->intern_data();
@@ -130,9 +139,10 @@ public:
//CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + s_txt));
}
- void one_clause_test() {
+ void one_clause_test()
+ {
D4RValue *arg1 = new D4RValue(s->var("i32"));
- D4RValue *arg2 = new D4RValue((long long)1024);
+ D4RValue *arg2 = new D4RValue((long long) 1024);
s->clauses().add_clause(new D4FilterClause(D4FilterClause::equal, arg1, arg2));
s->intern_data();
@@ -148,14 +158,14 @@ public:
CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + one_clause_txt));
}
-
- void two_clause_test() {
+ void two_clause_test()
+ {
D4RValue *arg1 = new D4RValue(s->var("i32"));
- D4RValue *arg2 = new D4RValue((long long)1024);
+ D4RValue *arg2 = new D4RValue((long long) 1024);
s->clauses().add_clause(new D4FilterClause(D4FilterClause::greater_equal, arg1, arg2));
D4RValue *arg1_2 = new D4RValue(s->var("i32"));
- D4RValue *arg2_2 = new D4RValue((long long)1048576);
+ D4RValue *arg2_2 = new D4RValue((long long) 1048576);
s->clauses().add_clause(new D4FilterClause(D4FilterClause::less_equal, arg1_2, arg2_2));
s->intern_data();
@@ -172,13 +182,14 @@ public:
CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + two_clause_txt));
}
- void two_variable_test() {
+ void two_variable_test()
+ {
D4RValue *arg1 = new D4RValue(s->var("i32"));
- D4RValue *arg2 = new D4RValue((long long)1024);
+ D4RValue *arg2 = new D4RValue((long long) 1024);
s->clauses().add_clause(new D4FilterClause(D4FilterClause::greater_equal, arg1, arg2));
D4RValue *arg1_2 = new D4RValue(s->var("f32"));
- D4RValue *arg2_2 = new D4RValue((long long)0.0);
+ D4RValue *arg2_2 = new D4RValue((long long) 0.0);
s->clauses().add_clause(new D4FilterClause(D4FilterClause::less, arg1_2, arg2_2));
s->intern_data();
@@ -195,38 +206,48 @@ public:
CPPUNIT_ASSERT(oss.str() == readTestBaseline(prefix + one_clause_txt));
}
- CPPUNIT_TEST_SUITE( D4SequenceTest );
+ CPPUNIT_TEST_SUITE (D4SequenceTest);
- CPPUNIT_TEST(ctor_test);
- CPPUNIT_TEST(assignment_test);
- CPPUNIT_TEST(copy_ctor_test);
+ CPPUNIT_TEST (ctor_test);
+ CPPUNIT_TEST (assignment_test);
+ CPPUNIT_TEST (copy_ctor_test);
- CPPUNIT_TEST(one_clause_test);
- CPPUNIT_TEST(two_clause_test);
- CPPUNIT_TEST(two_variable_test);
+ CPPUNIT_TEST (one_clause_test);
+ CPPUNIT_TEST (two_clause_test);
+ CPPUNIT_TEST (two_variable_test);
CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(D4SequenceTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (D4SequenceTest);
}
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4SequenceTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::D4SequenceTest::suite()->getTests();
+ unsigned int prefix_len = libdap::D4SequenceTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -235,9 +256,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::D4SequenceTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::D4SequenceTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/D4UnMarshallerTest.cc b/unit-tests/D4UnMarshallerTest.cc
index 90519ab..910a5e1 100644
--- a/unit-tests/D4UnMarshallerTest.cc
+++ b/unit-tests/D4UnMarshallerTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -64,16 +63,17 @@ const static string path = string(TEST_SRC_DIR) + "/D4-marshaller/little-endian"
using namespace std;
using namespace libdap;
+using namespace CppUnit;
class D4UnMarshallerTest: public CppUnit::TestFixture {
- CPPUNIT_TEST_SUITE( D4UnMarshallerTest );
+ CPPUNIT_TEST_SUITE (D4UnMarshallerTest);
- CPPUNIT_TEST(test_scalars);
- CPPUNIT_TEST(test_real_scalars);
- CPPUNIT_TEST(test_str);
- CPPUNIT_TEST(test_opaque);
- CPPUNIT_TEST(test_vector);
+ CPPUNIT_TEST (test_scalars);
+ CPPUNIT_TEST (test_real_scalars);
+ CPPUNIT_TEST (test_str);
+ CPPUNIT_TEST (test_opaque);
+ CPPUNIT_TEST (test_vector);
CPPUNIT_TEST_SUITE_END( );
@@ -97,13 +97,16 @@ class D4UnMarshallerTest: public CppUnit::TestFixture {
}
public:
- D4UnMarshallerTest() {
+ D4UnMarshallerTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
}
- void tearDown() {
+ void tearDown()
+ {
}
void test_scalars()
@@ -113,13 +116,13 @@ public:
// computes checksums and writes data
try {
- string file = path + "/test_scalars_1_bin.dat";
- DBG(cerr << "file: " << file << endl);
- in.open(file.c_str(), fstream::binary | fstream::in);
+ string file = path + "/test_scalars_1_bin.dat";
+ DBG(cerr << "file: " << file << endl);
+ in.open(file.c_str(), fstream::binary | fstream::in);
- // Don't use is_host_big_endian() because these tests should
- // never 'twiddle bytes' They are always testing little to little
- // of big to big
+ // Don't use is_host_big_endian() because these tests should
+ // never 'twiddle bytes' They are always testing little to little
+ // of big to big
D4StreamUnMarshaller dsm(in, 0 /*is_host_big_endian()*/);
dods_byte b;
@@ -190,7 +193,7 @@ public:
// computes checksums and writes data
try {
- string file = path + "/test_scalars_2_bin.dat";
+ string file = path + "/test_scalars_2_bin.dat";
in.open(file.c_str(), fstream::binary | fstream::in);
D4StreamUnMarshaller dsm(in, 0);
@@ -218,13 +221,14 @@ public:
}
}
- void test_str() {
+ void test_str()
+ {
fstream in;
in.exceptions(ostream::failbit | ostream::badbit);
// computes checksums and writes data
try {
- string file = path + "/test_scalars_3_bin.dat";
+ string file = path + "/test_scalars_3_bin.dat";
in.open(file.c_str(), fstream::binary | fstream::in);
D4StreamUnMarshaller dsm(in, 0);
@@ -252,13 +256,14 @@ public:
}
}
- void test_opaque() {
+ void test_opaque()
+ {
fstream in;
in.exceptions(ostream::failbit | ostream::badbit);
// computes checksums and writes data
try {
- string file = path + "/test_opaque_1_bin.dat";
+ string file = path + "/test_opaque_1_bin.dat";
in.open(file.c_str(), fstream::binary | fstream::in);
D4StreamUnMarshaller dsm(in, 0);
@@ -284,13 +289,14 @@ public:
}
}
- void test_vector() {
+ void test_vector()
+ {
fstream in;
in.exceptions(ostream::failbit | ostream::badbit);
// computes checksums and writes data
try {
- string file = path + "/test_vector_1_bin.dat";
+ string file = path + "/test_vector_1_bin.dat";
in.open(file.c_str(), fstream::binary | fstream::in);
D4StreamUnMarshaller dsm(in, 0);
@@ -313,14 +319,13 @@ public:
vector<dods_float64> buf3(32768);
dsm.get_vector_float64(reinterpret_cast<char*>(&buf3[0]), 32768);
for (int i = 0; i < 32768; ++i) {
- if (buf3[i] != i % (1 << 9))
- cerr << "buf3[" << i << "]: " << buf3[i] << endl;
+ if (buf3[i] != i % (1 << 9)) cerr << "buf3[" << i << "]: " << buf3[i] << endl;
CPPUNIT_ASSERT(buf3[i] == i % (1 << 9));
}
ck = dsm.get_checksum_str();
DBG(cerr << "ck: " << ck << endl);
CPPUNIT_ASSERT(ck == "aafc2a91" || ck == "7bdf9931");
- }
+ }
catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Caught an exception.");
@@ -333,14 +338,11 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( D4UnMarshallerTest ) ;
+CPPUNIT_TEST_SUITE_REGISTRATION (D4UnMarshallerTest);
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr));
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
@@ -348,10 +350,22 @@ int main(int argc, char*argv[]) {
case 'd':
debug = true; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: D4UnMarshallerTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = D4UnMarshallerTest::suite()->getTests();
+ unsigned int prefix_len = D4UnMarshallerTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -360,9 +374,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("D4UnMarshallerTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = D4UnMarshallerTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/DASTest.cc b/unit-tests/DASTest.cc
index 5ffbb33..b672dcb 100644
--- a/unit-tests/DASTest.cc
+++ b/unit-tests/DASTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -32,65 +31,111 @@
#include "DAS.h"
#include "debug.h"
#include <test_config.h>
+#include "GetOpt.h"
using namespace CppUnit;
using namespace libdap;
+static bool debug = false;
+
class DASTest: public TestFixture {
private:
DAS *das, *das2;
public:
- DASTest() {}
- ~DASTest() {}
+ DASTest()
+ {
+ }
+ ~DASTest()
+ {
+ }
- void setUp() {
- das = new DAS();
- das2 = new DAS();
+ void setUp()
+ {
+ das = new DAS();
+ das2 = new DAS();
}
- void tearDown() {
- delete das; das = 0;
- delete das2; das2 = 0;
+ void tearDown()
+ {
+ delete das;
+ das = 0;
+ delete das2;
+ das2 = 0;
}
- CPPUNIT_TEST_SUITE( DASTest );
+ CPPUNIT_TEST_SUITE (DASTest);
- CPPUNIT_TEST(error_values_test);
- CPPUNIT_TEST(symbol_name_test);
+ CPPUNIT_TEST (error_values_test);
+ CPPUNIT_TEST (symbol_name_test);
CPPUNIT_TEST_SUITE_END();
- void error_values_test() {
- try {
- das->parse((string)TEST_SRC_DIR + "/das-testsuite/bad_value_test.1");
- DBG2(das->print(stderr));
- }
- catch (Error &e) {
+ void error_values_test()
+ {
+ try {
+ das->parse((string) TEST_SRC_DIR + "/das-testsuite/bad_value_test.1");
+ DBG2(das->print(stderr));
+ }
+ catch (Error &e) {
cerr << e.get_error_message() << endl;
- CPPUNIT_ASSERT(!"Caught an unexpected Error object.");
- }
+ CPPUNIT_ASSERT(!"Caught an unexpected Error object.");
+ }
}
- void symbol_name_test() {
- das->parse((string)TEST_SRC_DIR + "/das-testsuite/test.34");
- CPPUNIT_ASSERT(das->get_table("var1")->get_attr("y#z", 0) == "15");
+ void symbol_name_test()
+ {
+ das->parse((string) TEST_SRC_DIR + "/das-testsuite/test.34");
+ CPPUNIT_ASSERT(das->get_table("var1")->get_attr("y#z", 0) == "15");
- string s = das->get_table("var1.component1.inner component")->get_attr("tag");
+ string s = das->get_table("var1.component1.inner component")->get_attr("tag");
CPPUNIT_ASSERT(s == "xyz123");
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(DASTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (DASTest);
-int
-main( int, char** )
+int main(int argc, char*argv[])
{
- CppUnit::TextTestRunner runner;
- runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = true; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: DASTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = DASTest::suite()->getTests();
+ unsigned int prefix_len = DASTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
- bool wasSuccessful = runner.run( "", false ) ;
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = DASTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/DDSTest.cc b/unit-tests/DDSTest.cc
index 26d15ea..27f6696 100644
--- a/unit-tests/DDSTest.cc
+++ b/unit-tests/DDSTest.cc
@@ -73,29 +73,38 @@ private:
DDS *dds_dap4;
public:
- DDSTest() : dds1(0), dds2(0), dds_dap4(0) {
+ DDSTest() :
+ dds1(0), dds2(0), dds_dap4(0)
+ {
}
- ~DDSTest() {
+ ~DDSTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
dds1 = new DDS(&factory, "test1");
dds2 = new DDS(&factory, "test2");
dds_dap4 = new DDS(&factory, "test2", "4.0");
}
- void tearDown() {
- delete dds1; dds1 = 0;
- delete dds2; dds2 = 0;
+ void tearDown()
+ {
+ delete dds1;
+ dds1 = 0;
+ delete dds2;
+ dds2 = 0;
- delete dds_dap4; dds_dap4 = 0;
+ delete dds_dap4;
+ dds_dap4 = 0;
}
- bool re_match(Regex &r, const string &s) {
+ bool re_match(Regex &r, const string &s)
+ {
int match = r.match(s.c_str(), s.length());
DBG(cerr << "Match: " << match << " should be: " << s.length() << endl);
- return match == static_cast<int> (s.length());
+ return match == static_cast<int>(s.length());
}
// The tests commented exercise features no longer supported
@@ -103,40 +112,41 @@ public:
// to work with transfer_attributes() - if a handler builds a malformed
// DAS, it will need to specialize the BaseType::transfer_attributes()
// method.
- CPPUNIT_TEST_SUITE( DDSTest );
- CPPUNIT_TEST(transfer_attributes_test_1);
- CPPUNIT_TEST(transfer_attributes_test_2);
+ CPPUNIT_TEST_SUITE (DDSTest);
+ CPPUNIT_TEST (transfer_attributes_test_1);
+ CPPUNIT_TEST (transfer_attributes_test_2);
- CPPUNIT_TEST(symbol_name_test);
+ CPPUNIT_TEST (symbol_name_test);
- // These test both transfer_attributes() and print_xml()
- CPPUNIT_TEST(print_xml_test);
+ // These test both transfer_attributes() and print_xml()
+ CPPUNIT_TEST (print_xml_test);
- CPPUNIT_TEST(print_xml_test2);
- CPPUNIT_TEST(print_xml_test3);
+ CPPUNIT_TEST (print_xml_test2);
+ CPPUNIT_TEST (print_xml_test3);
- // The X_1 tests look at the proper merging of hdf4's _dim_n attributes.
- // But that functionality was moved from libdap to the hdf4 handler.
- // CPPUNIT_TEST(print_xml_test3_1);
+ // The X_1 tests look at the proper merging of hdf4's _dim_n attributes.
+ // But that functionality was moved from libdap to the hdf4 handler.
+ // CPPUNIT_TEST(print_xml_test3_1);
- CPPUNIT_TEST(print_xml_test4);
- CPPUNIT_TEST(print_xml_test5);
- // CPPUNIT_TEST(print_xml_test5_1);
- CPPUNIT_TEST(print_xml_test6);
- // CPPUNIT_TEST(print_xml_test6_1);
- CPPUNIT_TEST(print_dmr_test);
+ CPPUNIT_TEST (print_xml_test4);
+ CPPUNIT_TEST (print_xml_test5);
+ // CPPUNIT_TEST(print_xml_test5_1);
+ CPPUNIT_TEST (print_xml_test6);
+ // CPPUNIT_TEST(print_xml_test6_1);
+ CPPUNIT_TEST (print_dmr_test);
- CPPUNIT_TEST(get_response_size_test);
- CPPUNIT_TEST(get_response_size_test_c);
- CPPUNIT_TEST(get_response_size_test_c2);
- CPPUNIT_TEST(get_response_size_test_c3);
+ CPPUNIT_TEST (get_response_size_test);
+ CPPUNIT_TEST (get_response_size_test_c);
+ CPPUNIT_TEST (get_response_size_test_c2);
+ CPPUNIT_TEST (get_response_size_test_c3);
- // see comment in code below. jhrg 2/4/14 CPPUNIT_TEST(get_response_size_test_seq);
- CPPUNIT_TEST(get_response_size_test_seq_c);
+ // see comment in code below. jhrg 2/4/14 CPPUNIT_TEST(get_response_size_test_seq);
+ CPPUNIT_TEST (get_response_size_test_seq_c);
CPPUNIT_TEST_SUITE_END();
- void transfer_attributes_test_1() {
+ void transfer_attributes_test_1()
+ {
try {
dds1->parse((string) TEST_SRC_DIR + "/dds-testsuite/fnoc1.nc.dds");
DAS das;
@@ -149,13 +159,15 @@ public:
AttrTable::Attr_iter i = at.attr_begin();
CPPUNIT_ASSERT(i != at.attr_end() && at.get_name(i) == "NC_GLOBAL");
CPPUNIT_ASSERT(i != at.attr_end() && at.get_name(++i) == "DODS_EXTRA");
- } catch (Error &e) {
+ }
+ catch (Error &e) {
cout << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Error thrown!");
}
}
- void transfer_attributes_test_2() {
+ void transfer_attributes_test_2()
+ {
try {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/3B42.980909.5.HDF.dds");
DAS das;
@@ -168,13 +180,15 @@ public:
AttrTable::Attr_iter i = at.attr_begin();
CPPUNIT_ASSERT(i != at.attr_end() && at.get_name(i) == "HDF_GLOBAL");
CPPUNIT_ASSERT(i != at.attr_end() && at.get_name(++i) == "CoreMetadata");
- } catch (Error &e) {
+ }
+ catch (Error &e) {
cout << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Error thrown!");
}
}
- void symbol_name_test() {
+ void symbol_name_test()
+ {
try {
// read a DDS.
dds1->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.18");
@@ -186,13 +200,15 @@ public:
CPPUNIT_ASSERT(dds2->var("huh.Image#data"));
CPPUNIT_ASSERT(dds2->var("c d"));
CPPUNIT_ASSERT(dds2->var("c%20d"));
- } catch (Error &e) {
+ }
+ catch (Error &e) {
cerr << e.get_error_message() << endl;
CPPUNIT_FAIL("Caught unexpected Error object");
}
}
- void print_xml_test() {
+ void print_xml_test()
+ {
try {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19b");
ostringstream oss;
@@ -210,7 +226,8 @@ public:
}
}
- void print_xml_test2() {
+ void print_xml_test2()
+ {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19c");
DAS das;
das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19c.das");
@@ -227,7 +244,8 @@ public:
CPPUNIT_ASSERT(baseline == oss.str());
}
- void print_xml_test3() {
+ void print_xml_test3()
+ {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19d");
DAS das;
das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19d.das");
@@ -246,7 +264,8 @@ public:
// This tests the HDF4 <var>_dim_n attribute. support for that was
// moved to the handler itself.
- void print_xml_test3_1() {
+ void print_xml_test3_1()
+ {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19d");
DAS das;
das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19d1.das");
@@ -263,14 +282,15 @@ public:
CPPUNIT_ASSERT(baseline == oss.str());
}
- void print_xml_test4() {
+ void print_xml_test4()
+ {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19e");
DAS das;
das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19e.das");
dds2->transfer_attributes(&das);
- DBG( dds2->var("c%20d")->get_attr_table().print(stderr) );
+ DBG(dds2->var("c%20d")->get_attr_table().print(stderr));
ostringstream oss;
dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
@@ -283,13 +303,19 @@ public:
}
void print_xml_test5() {
- dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19f");
+ string dds_file((string) TEST_SRC_DIR + "/dds-testsuite/test.19f");
+ dds2->parse(dds_file);
DAS das;
- das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19f.das");
+ string das_file((string) TEST_SRC_DIR + "/dds-testsuite/test.19f.das");
+ das.parse(das_file);
+ string baseline_file((string) TEST_SRC_DIR + "/dds-testsuite/test.19f.xml");
+ string baseline = readTestBaseline(baseline_file);
+
try {
dds2->transfer_attributes(&das);
- } catch (Error &e) {
+ }
+ catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Error exception");
}
@@ -299,23 +325,27 @@ public:
ostringstream oss;
dds2->print_xml_writer(oss, false, "http://localhost/dods/test.xyz");
+ DBG(cerr << "BASELINE DOCUMENT: " << baseline_file << endl);
+ DBG(cerr << baseline << endl);
+
+ DBG(cerr << "RESULT DOCUMENT: " << endl);
DBG(cerr << oss.str() << endl);
- string baseline = readTestBaseline((string) TEST_SRC_DIR + "/dds-testsuite/test.19f.xml");
- DBG2(cerr << baseline << endl);
CPPUNIT_ASSERT(baseline == oss.str());
}
// Tests flat DAS into a DDS; no longer supported by libdap; specialize
// handlers if they make these malformed DAS objects
- void print_xml_test5_1() {
+ void print_xml_test5_1()
+ {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19f");
DAS das;
das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19f1.das");
try {
dds2->transfer_attributes(&das);
- } catch (Error &e) {
+ }
+ catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Error exception");
}
@@ -332,7 +362,8 @@ public:
CPPUNIT_ASSERT(baseline == oss.str());
}
- void print_xml_test6() {
+ void print_xml_test6()
+ {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19b");
DAS das;
das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19b.das");
@@ -351,14 +382,16 @@ public:
// Tests flat DAS into a DDS; no longer supported by libdap; specialize
// handlers if they make these malformed DAS objects
- void print_xml_test6_1() {
+ void print_xml_test6_1()
+ {
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19g");
DAS das;
das.parse((string) TEST_SRC_DIR + "/dds-testsuite/test.19g.das");
try {
dds2->transfer_attributes(&das);
- } catch (Error &e) {
+ }
+ catch (Error &e) {
cerr << "Error: " << e.get_error_message() << endl;
CPPUNIT_FAIL("Error exception");
}
@@ -403,7 +436,8 @@ public:
}
}
- void get_response_size_test() {
+ void get_response_size_test()
+ {
dds1->parse((string) TEST_SRC_DIR + "/dds-testsuite/3B42.980909.5.HDF.dds");
CPPUNIT_ASSERT(dds1->get_request_size(false) == 230400);
DBG(cerr << "3B42.980909.5.HDF response size: " << dds1->get_request_size(false) << endl);
@@ -413,7 +447,8 @@ public:
DBG(cerr << "coads_climatology.nc response size: " << dds2->get_request_size(false) << endl);
}
- void get_response_size_test_c() {
+ void get_response_size_test_c()
+ {
ConstraintEvaluator eval;
dds1->parse((string) TEST_SRC_DIR + "/dds-testsuite/3B42.980909.5.HDF.dds");
@@ -429,7 +464,8 @@ public:
CPPUNIT_ASSERT(dds2->get_request_size(false) == 3119424);
}
- void get_response_size_test_c2() {
+ void get_response_size_test_c2()
+ {
ConstraintEvaluator eval;
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/coads_climatology.nc.dds");
eval.parse_constraint("SST[0:5][0:44][0:89]", *dds2);
@@ -437,7 +473,8 @@ public:
CPPUNIT_ASSERT(dds2->get_request_size(true) == 98328);
}
- void get_response_size_test_c3() {
+ void get_response_size_test_c3()
+ {
ConstraintEvaluator eval;
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/coads_climatology.nc.dds");
eval.parse_constraint("SST[0][0:44][0:89]", *dds2);
@@ -461,7 +498,8 @@ public:
}
#endif
- void get_response_size_test_seq_c() {
+ void get_response_size_test_seq_c()
+ {
ConstraintEvaluator eval;
dds2->parse((string) TEST_SRC_DIR + "/dds-testsuite/S2000415.HDF.dds");
eval.parse_constraint("NSCAT%20Rev%2020.NSCAT%20L2.Low_Wind_Speed_Flag", *dds2);
@@ -472,15 +510,64 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION(DDSTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (DDSTest);
-}
+} // namespace libdap
+
+int
+main(int argc, char *argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: DMRTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::DDSTest::suite()->getTests();
+ unsigned int prefix_len = libdap::DDSTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ return 1;
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for ( ; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::DDSTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+ return wasSuccessful ? 0 : 1;
+}
+#if 0
int main(int argc, char*argv[]) {
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
GetOpt getopt(argc, argv, "d");
+>>>>>>> master
int option_char;
while ((option_char = getopt()) != -1)
@@ -488,10 +575,22 @@ int main(int argc, char*argv[]) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: DDSTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::DDSTest::suite()->getTests();
+ unsigned int prefix_len = libdap::DDSTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -500,9 +599,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::DDSTest::") + argv[i++];
- DBG(cerr << "test: " << test << endl);
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::DDSTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
@@ -511,4 +610,5 @@ int main(int argc, char*argv[]) {
return wasSuccessful ? 0 : 1;
}
+#endif
diff --git a/unit-tests/DDXParserTest.cc b/unit-tests/DDXParserTest.cc
index 2931421..dcdc6d0 100644
--- a/unit-tests/DDXParserTest.cc
+++ b/unit-tests/DDXParserTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -50,79 +49,89 @@ static bool debug = false;
namespace libdap {
-class DDXParserTest : public TestFixture {
+class DDXParserTest: public TestFixture {
private:
BaseTypeFactory *factory;
DDXParser *ddx_parser;
DDS *dds;
public:
- DDXParserTest() {}
- ~DDXParserTest() {}
+ DDXParserTest()
+ {
+ }
+ ~DDXParserTest()
+ {
+ }
- void setUp() {
+ void setUp()
+ {
factory = new BaseTypeFactory;
ddx_parser = new DDXParser(factory);
dds = new DDS(factory);
}
- void tearDown() {
- delete ddx_parser; ddx_parser = 0;
- delete factory; factory = 0;
- delete dds; dds = 0;
- }
-
- CPPUNIT_TEST_SUITE( DDXParserTest );
-
- CPPUNIT_TEST(other_xml_parse_test1);
- CPPUNIT_TEST(other_xml_parse_test2);
- CPPUNIT_TEST(other_xml_parse_test3);
- CPPUNIT_TEST(dap_version_test);
- CPPUNIT_TEST(no_blob_version_32_test);
- CPPUNIT_TEST(blob_in_version_32_test);
- CPPUNIT_TEST(parsing_ddx_from_dataddx_test);
- CPPUNIT_TEST(top_level_attribute_test);
- CPPUNIT_TEST(top_level_attribute_container_test);
- CPPUNIT_TEST(top_level_simple_types_test);
- CPPUNIT_TEST(top_level_simple_types_with_attributes_test);
- CPPUNIT_TEST(simple_arrays_test);
- CPPUNIT_TEST(simple_arrays_multi_dim_test);
- CPPUNIT_TEST(simple_arrays_attributes_test);
- CPPUNIT_TEST(structure_test);
- CPPUNIT_TEST(sequence_test);
- CPPUNIT_TEST(grid_test);
- CPPUNIT_TEST(intern_stream_test);
- CPPUNIT_TEST(intern_ddx_from_dataddx_test);
- // FILE I/O tests
- CPPUNIT_TEST(top_level_simple_types_test_file_stream);
- CPPUNIT_TEST(structure_test_file_ptr);
+ void tearDown()
+ {
+ delete ddx_parser;
+ ddx_parser = 0;
+ delete factory;
+ factory = 0;
+ delete dds;
+ dds = 0;
+ }
+
+ CPPUNIT_TEST_SUITE (DDXParserTest);
+
+ CPPUNIT_TEST (other_xml_parse_test1);
+ CPPUNIT_TEST (other_xml_parse_test2);
+ CPPUNIT_TEST (other_xml_parse_test3);
+ CPPUNIT_TEST (dap_version_test);
+ CPPUNIT_TEST (no_blob_version_32_test);
+ CPPUNIT_TEST (blob_in_version_32_test);
+ CPPUNIT_TEST (parsing_ddx_from_dataddx_test);
+ CPPUNIT_TEST (top_level_attribute_test);
+ CPPUNIT_TEST (top_level_attribute_container_test);
+ CPPUNIT_TEST (top_level_simple_types_test);
+ CPPUNIT_TEST (top_level_simple_types_with_attributes_test);
+ CPPUNIT_TEST (simple_arrays_test);
+ CPPUNIT_TEST (simple_arrays_multi_dim_test);
+ CPPUNIT_TEST (simple_arrays_attributes_test);
+ CPPUNIT_TEST (structure_test);
+ CPPUNIT_TEST (sequence_test);
+ CPPUNIT_TEST (grid_test);
+ CPPUNIT_TEST (intern_stream_test);
+ CPPUNIT_TEST (intern_ddx_from_dataddx_test);
+ // FILE I/O tests
+ CPPUNIT_TEST (top_level_simple_types_test_file_stream);
+ CPPUNIT_TEST (structure_test_file_ptr);
#if 0
- // All of these fail; maybe because on OSX 10.9 something about
- // libxml2 is odd. Investigate. jhrg 2/4/14
- // FIXME
-
- // C++ Stream I/O tests
- CPPUNIT_TEST(top_level_simple_types_test_cpp_stream);
- CPPUNIT_TEST(structure_test_cpp_stream);
- CPPUNIT_TEST(sequence_test_cpp_stream);
- CPPUNIT_TEST(grid_test_cpp_stream);
+ // All of these fail; maybe because on OSX 10.9 something about
+ // libxml2 is odd. Investigate. jhrg 2/4/14
+ // FIXME
+
+ // C++ Stream I/O tests
+ CPPUNIT_TEST(top_level_simple_types_test_cpp_stream);
+ CPPUNIT_TEST(structure_test_cpp_stream);
+ CPPUNIT_TEST(sequence_test_cpp_stream);
+ CPPUNIT_TEST(grid_test_cpp_stream);
#endif
// Error tests
- CPPUNIT_TEST(unknown_tag_test);
- CPPUNIT_TEST(bad_nesting_test);
- CPPUNIT_TEST(unknown_end_tag_test);
- CPPUNIT_TEST(variable_in_attribtue_container_test);
- CPPUNIT_TEST(simple_type_missing_attribute_test);
- CPPUNIT_TEST(array_missing_dimension_test);
- CPPUNIT_TEST(array_missing_dimension_stream_read_test);
+ CPPUNIT_TEST (unknown_tag_test);
+ CPPUNIT_TEST (bad_nesting_test);
+ CPPUNIT_TEST (unknown_end_tag_test);
+ CPPUNIT_TEST (variable_in_attribtue_container_test);
+ CPPUNIT_TEST (simple_type_missing_attribute_test);
+ CPPUNIT_TEST (array_missing_dimension_test);
+ CPPUNIT_TEST (array_missing_dimension_stream_read_test);
CPPUNIT_TEST_SUITE_END();
- void other_xml_parse_test1() {
+ void other_xml_parse_test1()
+ {
try {
string cid;
- ddx_parser->intern((string)TEST_SRC_DIR + "/ddx-testsuite/test.1.other_xml.ddx", dds, cid);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.1.other_xml.ddx", dds, cid);
DBG(dds->print_xml(cout, false, " "));
CPPUNIT_ASSERT(dds->get_dataset_name() == "200803061600_HFRadar_USEGC_6km_rtv_SIO.nc");
CPPUNIT_ASSERT(dds->get_dap_major() == 3);
@@ -134,10 +143,11 @@ public:
}
}
- void other_xml_parse_test2() {
+ void other_xml_parse_test2()
+ {
try {
string cid;
- ddx_parser->intern((string)TEST_SRC_DIR + "/ddx-testsuite/test.2.other_xml.ddx", dds, cid);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.2.other_xml.ddx", dds, cid);
DBG(dds->print_xml(cout, false, " "));
CPPUNIT_ASSERT(dds->get_dataset_name() == "200803061600_HFRadar_USEGC_6km_rtv_SIO.nc");
CPPUNIT_ASSERT(dds->get_dap_major() == 3);
@@ -149,10 +159,11 @@ public:
}
}
- void other_xml_parse_test3() {
+ void other_xml_parse_test3()
+ {
try {
string cid;
- ddx_parser->intern((string)TEST_SRC_DIR + "/ddx-testsuite/test.3.other_xml.ddx", dds, cid);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.3.other_xml.ddx", dds, cid);
DBG(dds->print_xml(cout, false, " "));
CPPUNIT_ASSERT(dds->get_dataset_name() == "200803061600_HFRadar_USEGC_6km_rtv_SIO.nc");
CPPUNIT_ASSERT(dds->get_dap_major() == 3);
@@ -164,12 +175,12 @@ public:
}
}
- void dap_version_test() {
+ void dap_version_test()
+ {
FILE *in;
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.00.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.00.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
CPPUNIT_ASSERT(dds->get_dap_major() == 3);
CPPUNIT_ASSERT(dds->get_dap_minor() == 2);
@@ -199,14 +210,12 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.0c.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.0c.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
CPPUNIT_ASSERT(dds->get_dap_major() == 3);
CPPUNIT_ASSERT(dds->get_dap_minor() == 2);
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -218,12 +227,10 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.0d.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.0d.ddx", dds, blob);
CPPUNIT_FAIL("Parsing test.0d.ddx should fail since it's a DAP 3.2 doc with a dataBLOB tag.");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -235,8 +242,7 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/DDX_from_dataddx.xml", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/DDX_from_dataddx.xml", dds, blob);
CPPUNIT_ASSERT(true);
DBG(dds->print_xml(cout, false));
}
@@ -250,12 +256,10 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.01.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.01.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -267,11 +271,9 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.02.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.02.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -284,11 +286,9 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.03.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.03.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -300,8 +300,7 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.04.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.04.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
DBG(dds->print_xml(cout, false));
}
@@ -321,7 +320,7 @@ public:
try {
string blob;
ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.05.ddx", dds, blob);
+ + "/ddx-testsuite/test.05.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
DBG(dds->print_xml(cout, false))
;
@@ -332,72 +331,70 @@ public:
}
}
#else
- void top_level_simple_types_test_file_stream()
- {
- FILE *in;
- try {
- string blob;
- in = fopen(((string) TEST_SRC_DIR + "/ddx-testsuite/test.04.ddx").c_str(), "r");
- ddx_parser->intern_stream(in, dds, blob);
- fclose(in);
- CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
- DBG(dds->print_xml(cout, false));
- }
- catch (DDXParseFailed &e) {
- fclose(in);
- DBG(cerr << endl << "DDXParseFailed: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.04.ddx failed.");
- }
- catch (Error &e) {
- fclose(in);
- DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.04.ddx failed.");
- }
- }
-
- void top_level_simple_types_test_cpp_stream()
- {
- try {
- string blob;
- ifstream in(((string) TEST_SRC_DIR + "/ddx-testsuite/test.04.ddx").c_str());
- ddx_parser->intern_stream(in, dds, blob);
- DBG(dds->print_xml(cout, false));
- CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
- }
- catch (DDXParseFailed &e) {
- DBG(cerr << endl << "DDXParseFailed: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.04.ddx failed.");
- }
- catch (Error &e) {
- DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.04.ddx failed.");
- }
- }
-
- void top_level_simple_types_with_attributes_test()
- {
- try {
- string blob;
- ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.05.ddx", dds, blob);
- CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
- DBG(dds->print_xml(cout, false));
- }
- catch (DDXParseFailed &e) {
- DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.05.ddx failed.");
- }
- }
+ void top_level_simple_types_test_file_stream()
+ {
+ FILE *in;
+ try {
+ string blob;
+ in = fopen(((string) TEST_SRC_DIR + "/ddx-testsuite/test.04.ddx").c_str(), "r");
+ ddx_parser->intern_stream(in, dds, blob);
+ fclose(in);
+ CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+ DBG(dds->print_xml(cout, false));
+ }
+ catch (DDXParseFailed &e) {
+ fclose(in);
+ DBG(cerr << endl << "DDXParseFailed: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.04.ddx failed.");
+ }
+ catch (Error &e) {
+ fclose(in);
+ DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.04.ddx failed.");
+ }
+ }
+
+ void top_level_simple_types_test_cpp_stream()
+ {
+ try {
+ string blob;
+ ifstream in(((string) TEST_SRC_DIR + "/ddx-testsuite/test.04.ddx").c_str());
+ ddx_parser->intern_stream(in, dds, blob);
+ DBG(dds->print_xml(cout, false));
+ CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+ }
+ catch (DDXParseFailed &e) {
+ DBG(cerr << endl << "DDXParseFailed: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.04.ddx failed.");
+ }
+ catch (Error &e) {
+ DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.04.ddx failed.");
+ }
+ }
+
+ void top_level_simple_types_with_attributes_test()
+ {
+ try {
+ string blob;
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.05.ddx", dds, blob);
+ CPPUNIT_ASSERT(dds->get_dataset_name() == "SimpleTypes");
+ DBG(dds->print_xml(cout, false));
+ }
+ catch (DDXParseFailed &e) {
+ DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.05.ddx failed.");
+ }
+ }
#endif
void simple_arrays_test()
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.06.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.06.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "OneDimensionalSimpleArrays");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -409,11 +406,9 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.07.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.07.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "MultiDimensionalSimpleArrays");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -425,11 +420,9 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.08.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.08.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -441,11 +434,9 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.09.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.09.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -457,11 +448,9 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.0a.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.0a.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -471,61 +460,59 @@ public:
void structure_test_file_ptr()
{
- FILE *in;
- try {
- string blob;
- in = fopen((string(TEST_SRC_DIR) + "/ddx-testsuite/test.09.ddx").c_str(), "r");
- ddx_parser->intern_stream(in, dds, blob);
- fclose(in);
- CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false));
- }
- catch (DDXParseFailed &e) {
- fclose(in);
- DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.09.ddx failed.");
- }
+ FILE *in;
+ try {
+ string blob;
+ in = fopen((string(TEST_SRC_DIR) + "/ddx-testsuite/test.09.ddx").c_str(), "r");
+ ddx_parser->intern_stream(in, dds, blob);
+ fclose(in);
+ CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+ DBG(dds->print_xml(cout, false));
+ }
+ catch (DDXParseFailed &e) {
+ fclose(in);
+ DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.09.ddx failed.");
+ }
}
void structure_test_cpp_stream()
{
- try {
- string blob;
- ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.09.ddx").c_str());
- ddx_parser->intern_stream(input, dds, blob);
- CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false));
- }
- catch (DDXParseFailed &e) {
- DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.09.ddx failed.");
- }
+ try {
+ string blob;
+ ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.09.ddx").c_str());
+ ddx_parser->intern_stream(input, dds, blob);
+ CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+ DBG(dds->print_xml(cout, false));
+ }
+ catch (DDXParseFailed &e) {
+ DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.09.ddx failed.");
+ }
}
void sequence_test_cpp_stream()
{
- try {
- string blob;
- ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.0a.ddx").c_str());
- ddx_parser->intern_stream(input, dds, blob);
- CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false));
- }
- catch (DDXParseFailed &e) {
- DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.0a.ddx failed.");
- }
+ try {
+ string blob;
+ ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.0a.ddx").c_str());
+ ddx_parser->intern_stream(input, dds, blob);
+ CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+ DBG(dds->print_xml(cout, false));
+ }
+ catch (DDXParseFailed &e) {
+ DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.0a.ddx failed.");
+ }
}
void grid_test()
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/test.0b.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/test.0b.ddx", dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -533,32 +520,30 @@ public:
}
}
- void grid_test_cpp_stream()
- {
- try {
- string blob;
- ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.0b.ddx").c_str());
- ddx_parser->intern_stream(input, dds, blob);
- CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false));
- }
- catch (DDXParseFailed &e) {
- DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
- CPPUNIT_FAIL("test.0b.ddx failed.");
- }
- }
+ void grid_test_cpp_stream()
+ {
+ try {
+ string blob;
+ ifstream input((string(TEST_SRC_DIR) + "/ddx-testsuite/test.0b.ddx").c_str());
+ ddx_parser->intern_stream(input, dds, blob);
+ CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
+ DBG(dds->print_xml(cout, false));
+ }
+ catch (DDXParseFailed &e) {
+ DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
+ CPPUNIT_FAIL("test.0b.ddx failed.");
+ }
+ }
void intern_stream_test()
{
try {
- string file_name = (string) TEST_SRC_DIR
- + "/ddx-testsuite/test.0b.ddx";
+ string file_name = (string) TEST_SRC_DIR + "/ddx-testsuite/test.0b.ddx";
FILE *in = fopen(file_name.c_str(), "r");
string blob;
ddx_parser->intern_stream(in, dds, blob);
CPPUNIT_ASSERT(dds->get_dataset_name() == "testdata");
- DBG(dds->print_xml(cout, false))
- ;
+ DBG(dds->print_xml(cout, false));
}
catch (DDXParseFailed &e) {
DBG(cerr << endl << "Error: " << e.get_error_message() << endl);
@@ -572,13 +557,11 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/error.01.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.01.ddx", dds, blob);
CPPUNIT_FAIL("error.01.ddx should fail!");
}
catch (DDXParseFailed &e) {
- DBG(cerr << "Error: " << e.get_error_message() << endl)
- ;
+ DBG(cerr << "Error: " << e.get_error_message() << endl);
}
}
@@ -586,13 +569,11 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/error.02.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.02.ddx", dds, blob);
CPPUNIT_FAIL("error.02.ddx should fail!");
}
catch (DDXParseFailed &e) {
- DBG(cerr << "Error: " << e.get_error_message() << endl)
- ;
+ DBG(cerr << "Error: " << e.get_error_message() << endl);
}
}
@@ -600,13 +581,11 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/error.03.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.03.ddx", dds, blob);
CPPUNIT_FAIL("error.03.ddx should fail!");
}
catch (DDXParseFailed &e) {
- DBG(cerr << "Error: " << e.get_error_message() << endl)
- ;
+ DBG(cerr << "Error: " << e.get_error_message() << endl);
}
}
@@ -614,13 +593,11 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/error.04.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.04.ddx", dds, blob);
CPPUNIT_FAIL("error.04.ddx should fail!");
}
catch (DDXParseFailed &e) {
- DBG(cerr << "Error: " << e.get_error_message() << endl)
- ;
+ DBG(cerr << "Error: " << e.get_error_message() << endl);
}
}
@@ -628,13 +605,11 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/error.05.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.05.ddx", dds, blob);
CPPUNIT_FAIL("error.05.ddx should fail!");
}
catch (DDXParseFailed &e) {
- DBG(cerr << "Error: " << e.get_error_message() << endl)
- ;
+ DBG(cerr << "Error: " << e.get_error_message() << endl);
}
}
@@ -642,37 +617,32 @@ public:
{
try {
string blob;
- ddx_parser->intern((string) TEST_SRC_DIR
- + "/ddx-testsuite/error.06.ddx", dds, blob);
+ ddx_parser->intern((string) TEST_SRC_DIR + "/ddx-testsuite/error.06.ddx", dds, blob);
CPPUNIT_FAIL("error.06.ddx should fail!");
}
catch (DDXParseFailed &e) {
- DBG(cerr << "Error: " << e.get_error_message() << endl)
- ;
+ DBG(cerr << "Error: " << e.get_error_message() << endl);
}
}
void array_missing_dimension_stream_read_test()
{
try {
- string file_name = (string) TEST_SRC_DIR
- + "/ddx-testsuite/error.05.ddx";
+ string file_name = (string) TEST_SRC_DIR + "/ddx-testsuite/error.05.ddx";
FILE *in = fopen(file_name.c_str(), "r");
string blob;
ddx_parser->intern_stream(in, dds, blob);
CPPUNIT_FAIL("error.05.ddx should fail!");
}
catch (DDXParseFailed &e) {
- DBG(cerr << "Error: " << e.get_error_message() << endl)
- ;
+ DBG(cerr << "Error: " << e.get_error_message() << endl);
}
}
void intern_ddx_from_dataddx_test()
{
try {
- string file_name = (string) TEST_SRC_DIR
- + "/ddx-testsuite/dataddx_without_top_headers.dap";
+ string file_name = (string) TEST_SRC_DIR + "/ddx-testsuite/dataddx_without_top_headers.dap";
FILE *in = fopen(file_name.c_str(), "r");
// First read the initial set of 'part' headers for the DDX
@@ -692,22 +662,32 @@ public:
}
-CPPUNIT_TEST_SUITE_REGISTRATION( DDXParserTest );
-
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+CPPUNIT_TEST_SUITE_REGISTRATION (DDXParserTest);
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
- switch (option_char) {
- case 'd':
- debug = 1; // debug is a static global
- break;
- default:
- break;
- }
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: DDXParserTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::DDXParserTest::suite()->getTests();
+ unsigned int prefix_len = libdap::DDXParserTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
bool wasSuccessful = true;
string test = "";
@@ -717,9 +697,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::DDXParserTest::") + argv[i++];
- DBG(cerr << "test: " << test << endl);
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::DDXParserTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/DMRTest.cc b/unit-tests/DMRTest.cc
index 06d9393..eabc02a 100644
--- a/unit-tests/DMRTest.cc
+++ b/unit-tests/DMRTest.cc
@@ -66,28 +66,32 @@ static bool debug = false;
using namespace CppUnit;
using namespace std;
-
-namespace libdap {
+using namespace libdap;
class DMRTest: public TestFixture {
private:
public:
- DMRTest() {
+ DMRTest()
+ {
}
- ~DMRTest() {
+ ~DMRTest()
+ {
}
- void setUp() {
+ void setUp()
+ {
}
- void tearDown() {
+ void tearDown()
+ {
}
- bool re_match(Regex &r, const string &s) {
+ bool re_match(Regex &r, const string &s)
+ {
int match = r.match(s.c_str(), s.length());
DBG(cerr << "Match: " << match << " should be: " << s.length() << endl);
- return match == static_cast<int> (s.length());
+ return match == static_cast<int>(s.length());
}
/**
@@ -98,196 +102,295 @@ public:
* @param attr
* @return A pointer to the new DMR; caller must delete
*/
- DMR *build_dmr(const string &dds_file, const string &attr = "") {
- try {
- string prefix = string(TEST_SRC_DIR) + "/dds-testsuite/";
-
- BaseTypeFactory factory;
- DDS dds(&factory, dds_file);
- dds.parse(prefix + dds_file);
- DBG(cerr << "DDS: " << endl; dds.print(cerr));
-
- if (!attr.empty()) {
- DAS das;
- das.parse(prefix + attr);
- dds.transfer_attributes(&das);
- }
-
- D4BaseTypeFactory d4_factory;
- return new DMR(&d4_factory, dds);
- }
- catch (Error &e) {
- CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
- }
-
- return 0;
+ DMR *build_dmr(const string &dds_file, const string &das_file = "")
+ {
+ DBG(cerr << __func__ << "() - BEGIN" << endl);
+ DBG(cerr << __func__ << "() - dds_file: " << dds_file << endl);
+ DBG(cerr << __func__ << "() - das_file: " << das_file << endl);
+
+ try {
+ string prefix = string(TEST_SRC_DIR) + "/dmr-testsuite/";
+
+ BaseTypeFactory factory;
+ DDS dds(&factory, dds_file);
+ dds.parse(prefix + dds_file);
+ DBG(cerr << "SOURCE DDS: " << endl; dds.print(cerr));
+
+ if (!das_file.empty()) {
+ DAS das;
+ das.parse(prefix + das_file);
+ dds.transfer_attributes(&das);
+ DBG(cerr << "SOURCE DAS: " << endl; das.print(cerr));
+
+ DBG(cerr << "dds.print_das(): " << endl; dds.print_das(cerr));
+ // DBG(cerr << "dds.print_xml(): " << endl; dds.print_xml(cerr,false,"blob_foo"));
+ }
+
+ D4BaseTypeFactory d4_factory;
+ DBG(cerr << __func__ << "() - END" << endl);
+ return new DMR(&d4_factory, dds);
+ }
+ catch (Error &e) {
+ CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+ }
+
+ return 0;
}
- void test_template(const string &dds_file, const string &dmr_baseline, const string &attr = "") {
- DMR *dmr = 0;
- try {
- dmr = build_dmr(dds_file, attr);
- XMLWriter xml;
- dmr->print_dap4(xml);
- DBG(cerr << "DMR: " << endl << xml.get_doc() << endl);
-
- string prefix = string(TEST_SRC_DIR) + "/dds-testsuite/";
- CPPUNIT_ASSERT(string(xml.get_doc()) == readTestBaseline(prefix + dmr_baseline));
- delete dmr;
- }
- catch (Error &e) {
- delete dmr;
- CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
- }
+ void test_template(const string &dds_file, const string &dmr_baseline, const string &attr = "")
+ {
+ DBG(cerr << __func__ << "() - BEGIN" << endl);
+ DMR *dmr = 0;
+ try {
+ dmr = build_dmr(dds_file, attr);
+ XMLWriter xml;
+ dmr->print_dap4(xml);
+ DBG(cerr << "DMR: " << endl << xml.get_doc() << endl);
+
+ string prefix = string(TEST_SRC_DIR) + "/dmr-testsuite/";
+ CPPUNIT_ASSERT(string(xml.get_doc()) == readTestBaseline(prefix + dmr_baseline));
+ delete dmr;
+ }
+ catch (Error &e) {
+ delete dmr;
+ CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+ }
+ DBG(cerr << __func__ << "() - END" << endl);
}
- CPPUNIT_TEST_SUITE( DMRTest );
+ CPPUNIT_TEST_SUITE (DMRTest);
- CPPUNIT_TEST(test_dmr_from_dds_1);
- CPPUNIT_TEST(test_dmr_from_dds_2);
- CPPUNIT_TEST(test_dmr_from_dds_3);
- CPPUNIT_TEST(test_dmr_from_dds_4);
- CPPUNIT_TEST(test_dmr_from_dds_5);
+ CPPUNIT_TEST (test_dmr_from_dds_1);
+ CPPUNIT_TEST (test_dmr_from_dds_2);
+ CPPUNIT_TEST (test_dmr_from_dds_3);
+ CPPUNIT_TEST (test_dmr_from_dds_4);
+ CPPUNIT_TEST (test_dmr_from_dds_5);
+ CPPUNIT_TEST (test_dmr_from_dds_6);
- CPPUNIT_TEST(test_dmr_from_dds_with_attr_1);
- CPPUNIT_TEST(test_dmr_from_dds_with_attr_2);
+ CPPUNIT_TEST (test_dmr_from_dds_with_attr_1);
+ CPPUNIT_TEST (test_dmr_from_dds_with_attr_2);
- CPPUNIT_TEST(test_copy_ctor);
- CPPUNIT_TEST(test_copy_ctor_2);
- CPPUNIT_TEST(test_copy_ctor_3);
- CPPUNIT_TEST(test_copy_ctor_4);
+ CPPUNIT_TEST (test_copy_ctor);
+ CPPUNIT_TEST (test_copy_ctor_2);
+ CPPUNIT_TEST (test_copy_ctor_3);
+ CPPUNIT_TEST (test_copy_ctor_4);
CPPUNIT_TEST_SUITE_END();
// Test a DDS with simple scalar types and no attributes
- void test_dmr_from_dds_1() {
- test_template("test.1", "test.1.dmr");
+ void test_dmr_from_dds_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("test.1", "test.1.dmr");
+ DBG(cerr << __func__ << "() - END" << endl);
}
// What about arrays? This should build shared dimensions
- void test_dmr_from_dds_2() {
- test_template("fnoc1.nc.dds", "fnoc1.nc.dmr");
+ void test_dmr_from_dds_2()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("fnoc1.nc.dds", "fnoc1.nc.dmr");
+ DBG(cerr << __func__ << "() - END" << endl);
}
- void test_dmr_from_dds_3() {
- test_template("3B42.980909.5.HDF.dds", "3B42.980909.5.HDF.dmr");
+ void test_dmr_from_dds_3()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("3B42.980909.5.HDF.dds", "3B42.980909.5.HDF.dmr");
+ DBG(cerr << __func__ << "() - END" << endl);
}
- void test_dmr_from_dds_4() {
- test_template("S2000415.HDF.dds", "S2000415.HDF.dmr");
+ void test_dmr_from_dds_4()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("S2000415.HDF.dds", "S2000415.HDF.dmr");
+ DBG(cerr << __func__ << "() - END" << endl);
}
- void test_dmr_from_dds_5() {
- test_template("coads_climatology.nc.dds", "coads_climatology.nc.dmr");
+ void test_dmr_from_dds_5()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("coads_climatology.nc.dds", "coads_climatology.nc.dmr");
+ DBG(cerr << __func__ << "() - END" << endl);
}
- void test_dmr_from_dds_with_attr_1() {
- test_template("test.1", "test.1.attr.dmr", "test.1.das");
+ void test_dmr_from_dds_6()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("structure_1.dds", "structure_1.dds.dmr");
+ DBG(cerr << __func__ << "() - END" << endl);
}
- void test_dmr_from_dds_with_attr_2() {
- // The 'hacked' file has global attributes
- test_template("3B42.980909.5.HDF.dds", "3B42.980909.5.hacked.2.HDF.attr.dmr", "3B42.980909.5.hacked.2.HDF.das");
+ void test_dmr_from_dds_with_attr_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("test.1", "test.1.attr.dmr", "test.1.das");
+ DBG(cerr << __func__ << "() - END" << endl);
}
- void test_copy_ctor() {
- DMR *dmr = build_dmr("test.1", "test.1.das");
- DMR *dmr_2 = new DMR(*dmr);
+ void test_dmr_from_dds_with_attr_2()
+ {
+ // The 'hacked' file has global attributes
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("3B42.980909.5.HDF.dds", "3B42.980909.5.hacked.2.HDF.attr.dmr", "3B42.980909.5.hacked.2.HDF.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
- XMLWriter xml;
- dmr->print_dap4(xml);
- string dmr_src = string(xml.get_doc());
- DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+ void test_copy_ctor()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ DMR *dmr = build_dmr("test.1", "test.1.das");
+ DMR *dmr_2 = new DMR(*dmr);
- XMLWriter xml2;
- dmr_2->print_dap4(xml2);
- string dmr_dest = string(xml2.get_doc());
- DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+ XMLWriter xml;
+ dmr->print_dap4(xml);
+ string dmr_src = string(xml.get_doc());
+ DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
- delete dmr;
- delete dmr_2;
- CPPUNIT_ASSERT(dmr_src == dmr_dest);
+ XMLWriter xml2;
+ dmr_2->print_dap4(xml2);
+ string dmr_dest = string(xml2.get_doc());
+ DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+ delete dmr;
+ delete dmr_2;
+ CPPUNIT_ASSERT(dmr_src == dmr_dest);
+
+ DBG(cerr << __func__ << "() - END" << endl);
}
// This tests if using the copy still works after the original is deleted
- void test_copy_ctor_2() {
- DMR *dmr = build_dmr("test.1", "test.1.das");
- DMR *dmr_2 = new DMR(*dmr);
+ void test_copy_ctor_2()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ DMR *dmr = build_dmr("test.1", "test.1.das");
+ DMR *dmr_2 = new DMR(*dmr);
- XMLWriter xml;
- dmr->print_dap4(xml);
- string dmr_src = string(xml.get_doc());
- DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+ XMLWriter xml;
+ dmr->print_dap4(xml);
+ string dmr_src = string(xml.get_doc());
+ DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
- delete dmr;
+ delete dmr;
- XMLWriter xml2;
- dmr_2->print_dap4(xml2);
- string dmr_dest = string(xml2.get_doc());
- DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+ XMLWriter xml2;
+ dmr_2->print_dap4(xml2);
+ string dmr_dest = string(xml2.get_doc());
+ DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
- delete dmr_2;
- CPPUNIT_ASSERT(dmr_src == dmr_dest);
+ delete dmr_2;
+ CPPUNIT_ASSERT(dmr_src == dmr_dest);
+ DBG(cerr << __func__ << "() - END" << endl);
}
// Test the grid/coverage and copy ctor code
- void test_copy_ctor_3() {
- DMR *dmr = build_dmr("coads_climatology.nc.dds", "coads_climatology.nc.das");
- DMR *dmr_2 = new DMR(*dmr);
-
- XMLWriter xml;
- dmr->print_dap4(xml);
- string dmr_src = string(xml.get_doc());
- DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
-
- XMLWriter xml2;
- dmr_2->print_dap4(xml2);
- string dmr_dest = string(xml2.get_doc());
- DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
-
- delete dmr;
- delete dmr_2;
- CPPUNIT_ASSERT(dmr_src == dmr_dest);
-
+ void test_copy_ctor_3()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ DMR *dmr = build_dmr("coads_climatology.nc.dds", "coads_climatology.nc.das");
+ DMR *dmr_2 = new DMR(*dmr);
+
+ XMLWriter xml;
+ dmr->print_dap4(xml);
+ string dmr_src = string(xml.get_doc());
+ DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+
+ XMLWriter xml2;
+ dmr_2->print_dap4(xml2);
+ string dmr_dest = string(xml2.get_doc());
+ DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+
+ delete dmr;
+ delete dmr_2;
+ CPPUNIT_ASSERT(dmr_src == dmr_dest);
+
+ DBG(cerr << __func__ << "() - END" << endl);
}
// Make the same test as above, but bypass the DMR ctor that uses a DDS object.
- void test_copy_ctor_4() {
- D4BaseTypeFactory factory;
- DMR *dmr = new DMR(&factory, "coads");
-
- string prefix = string(TEST_SRC_DIR) + "/D4-xml/coads_climatology.nc.xml";
- ifstream ifs(prefix.c_str());
- D4ParserSax2 parser;
- parser.intern(ifs, dmr);
+ void test_copy_ctor_4()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ D4BaseTypeFactory factory;
+ DMR *dmr = new DMR(&factory, "coads");
+
+ string prefix = string(TEST_SRC_DIR) + "/D4-xml/coads_climatology.nc.xml";
+ ifstream ifs(prefix.c_str());
+ D4ParserSax2 parser;
+ parser.intern(ifs, dmr);
+
+ DMR *dmr_2 = new DMR(*dmr);
+
+ XMLWriter xml;
+ dmr->print_dap4(xml);
+ string dmr_src = string(xml.get_doc());
+ DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+
+ XMLWriter xml2;
+ dmr_2->print_dap4(xml2);
+ string dmr_dest = string(xml2.get_doc());
+ DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+
+ delete dmr;
+ delete dmr_2;
+ CPPUNIT_ASSERT(dmr_src == dmr_dest);
+
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
- DMR *dmr_2 = new DMR(*dmr);
+};
- XMLWriter xml;
- dmr->print_dap4(xml);
- string dmr_src = string(xml.get_doc());
- DBG(cerr << "DMR SRC: " << endl << dmr_src << endl);
+CPPUNIT_TEST_SUITE_REGISTRATION (DMRTest);
- XMLWriter xml2;
- dmr_2->print_dap4(xml2);
- string dmr_dest = string(xml2.get_doc());
- DBG(cerr << "DMR DEST: " << endl << dmr_dest << endl);
+int main(int argc, char *argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
- delete dmr;
- delete dmr_2;
- CPPUNIT_ASSERT(dmr_src == dmr_dest);
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
- }
+ case 'h': { // help - show test names
+ cerr << "Usage: DMRTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = DMRTest::suite()->getTests();
+ unsigned int prefix_len = DMRTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
-};
+ default:
+ break;
+ }
-CPPUNIT_TEST_SUITE_REGISTRATION(DMRTest);
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = DMRTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
-} // namepsace libdap
+ return wasSuccessful ? 0 : 1;
+}
+//##################################################################################################
+#if 0 // old way
int main(int argc, char*argv[]) {
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
@@ -296,13 +399,13 @@ int main(int argc, char*argv[]) {
int option_char;
while ((option_char = getopt()) != -1)
- switch (option_char) {
+ switch (option_char) {
case 'd':
- debug = 1; // debug is a static global
- break;
+ debug = 1; // debug is a static global
+ break;
default:
- break;
- }
+ break;
+ }
bool wasSuccessful = true;
string test = "";
@@ -313,7 +416,7 @@ int main(int argc, char*argv[]) {
}
else {
while (i < argc) {
- test = string("libdap::DMRTest::") + argv[i++];
+ test = string("DMRTest::") + argv[i++];
DBG(cerr << "test: " << test << endl);
wasSuccessful = wasSuccessful && runner.run(test);
}
@@ -323,4 +426,5 @@ int main(int argc, char*argv[]) {
return wasSuccessful ? 0 : 1;
}
+#endif
diff --git a/unit-tests/DmrRoundTripTest.cc b/unit-tests/DmrRoundTripTest.cc
new file mode 100644
index 0000000..8d3da99
--- /dev/null
+++ b/unit-tests/DmrRoundTripTest.cc
@@ -0,0 +1,329 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher at opendap.org>
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4BaseTypeFactory.h"
+#include "D4ParserSax2.h"
+
+#include "GNURegex.h"
+#include "GetOpt.h"
+#include "util.h"
+#include "debug.h"
+#include "GetOpt.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+static bool debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static string THE_TESTS_DIR("/dmr-rt-testsuite/");
+
+class DmrRoundTripTest: public TestFixture {
+private:
+
+public:
+ DmrRoundTripTest()
+ {
+ }
+ ~DmrRoundTripTest()
+ {
+ }
+
+ void setUp()
+ {
+ }
+
+ void tearDown()
+ {
+ }
+
+ bool re_match(Regex &r, const string &s)
+ {
+ int match = r.match(s.c_str(), s.length());
+ DBG(cerr << "Match: " << match << " should be: " << s.length() << endl);
+ return match == static_cast<int>(s.length());
+ }
+
+ /**
+ * Given the name of a DDS and optional DAS file, build a DMR using the
+ * hackery known as transform_to_dap4 and the new DMR ctor.
+ *
+ * @param dds_file
+ * @param attr
+ * @return A pointer to the new DMR; caller must delete
+ */
+ DMR *build_dmr(const string &dds_file, const string &das_file = "")
+ {
+ DBG(cerr << __func__ << "() - BEGIN" << endl);
+ DBG(cerr << __func__ << "() - dds_file: " << dds_file << endl);
+ DBG(cerr << __func__ << "() - das_file: " << das_file << endl);
+
+ try {
+ string prefix = string(TEST_SRC_DIR) + THE_TESTS_DIR;
+
+ BaseTypeFactory factory;
+ DDS dds(&factory, dds_file);
+ dds.parse(prefix + dds_file);
+ DBG(cerr << "SOURCE DDS: " << prefix + dds_file << endl; dds.print(cerr));
+
+ if (!das_file.empty()) {
+ DAS das;
+ das.parse(prefix + das_file);
+ dds.transfer_attributes(&das);
+ DBG(cerr << "SOURCE DAS: " << prefix + das_file << endl; das.print(cerr));
+
+ DBG(cerr << "dds.print_das(): " << endl; dds.print_das(cerr));
+ // DBG(cerr << "dds.print_xml(): " << endl; dds.print_xml(cerr,false,"blob_foo"));
+ }
+
+ D4BaseTypeFactory d4_factory;
+ DBG(cerr << __func__ << "() - END" << endl);
+ return new DMR(&d4_factory, dds);
+ }
+ catch (Error &e) {
+ CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+ }
+
+ return 0;
+ }
+
+ void test_roundtrip_template(const string &dds_file, const string &dmr_baseline, const string &das_file = "",
+ bool expected_fail = false)
+ {
+ DBG(cerr << __func__ << "() - BEGIN" << endl);
+
+ DMR *dmr = 0;
+ try {
+ dmr = build_dmr(dds_file, das_file);
+ XMLWriter xml;
+ dmr->print_dap4(xml);
+ DBG(cerr << "DMR: " << endl << xml.get_doc() << endl);
+
+ string prefix = string(TEST_SRC_DIR) + THE_TESTS_DIR;
+ string result_dmr(xml.get_doc());
+ string baseline_dmr = readTestBaseline(prefix + dmr_baseline);
+ DBG(
+ cerr << "BASELINE DMR(" << baseline_dmr.size() << " chars): " << prefix + dmr_baseline << endl
+ << baseline_dmr << endl);
+ DBG(cerr << "RESULT DMR(" << result_dmr.size() << " chars): " << endl << result_dmr << endl);
+
+ CPPUNIT_ASSERT(result_dmr == baseline_dmr);
+
+ DDS *dds = dmr->getDDS();
+ std::ostringstream result_dds;
+ dds->print(result_dds);
+
+ string source_dds = readTestBaseline(prefix + dds_file);
+ DBG(
+ cerr << "SOURCE DDS(" << source_dds.size() << " chars): " << prefix + dds_file << endl << source_dds
+ << endl);
+
+ DBG(cerr << "RESULT DDS(" << result_dds.str().size() << " chars): " << endl << result_dds.str() << endl);
+ CPPUNIT_ASSERT(result_dds.str() == source_dds);
+
+ if (!das_file.empty()) {
+ std::ostringstream result_das;
+ dds->print_das(result_das);
+
+ string source_das = readTestBaseline(prefix + das_file);
+ DBG(
+ cerr << "SOURCE DAS(" << source_das.size() << " chars): " << prefix + das_file << endl << source_das
+ << endl);
+
+ DBG(
+ cerr << "RESULT DAS(" << result_das.str().size() << " chars): " << endl << result_das.str()
+ << endl);
+ CPPUNIT_ASSERT(result_das.str() == source_das);
+
+ }
+ delete dmr;
+ delete dds;
+ }
+ catch (Error &e) {
+ delete dmr;
+ CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+ }
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void i_am_broken(string name)
+ {
+ cerr << endl;
+ cerr << "###################################################################" << endl;
+ cerr << " THE CRUCIAL TEST: '" << name << "' IS BROKEN AND HAS BEEN DISABLED." << endl;
+ cerr << " Please enable the test '" << name << "', fix it, and check it in." << endl;
+ }
+
+ void test_dds_to_dmr_to_dds_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_roundtrip_template("attr_test_00.dds", "attr_test_00.dmr", "attr_test_00.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void test_dds_to_dmr_to_dds_2()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_roundtrip_template("test.1", "test.1.full.dmr", "test.1.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void test_dds_to_dmr_to_dds_3()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_roundtrip_template("fnoc1.nc.dds", "fnoc1.nc.dmr.xml", "fnoc1.nc.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void test_dds_to_dmr_to_dds_4()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_roundtrip_template("3B42.980909.5.HDF.dds", "3B42.980909.5.HDF.full.dmr", "3B42.980909.5.HDF.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void test_dds_to_dmr_to_dds_5()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_roundtrip_template("S2000415.HDF.dds", "S2000415.HDF.full.dmr", "S2000415.HDF.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void test_grid_rt_01()
+ {
+ DBG(
+ cerr << endl << __func__ << "() - BEGIN: " << "Testing simple Grid->D4Array->Grid with 'correct' DAS."
+ << endl);
+ // i_am_broken(__func__);
+ test_roundtrip_template("attr_test_01.dds", "attr_test_01.dmr", "attr_test_01.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void test_grid_rt_02()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN: " << "Testing Grid->D4Array->Grid with 'correct' DAS." << endl);
+ i_am_broken(__func__);
+// test_roundtrip_template("coads_climatology.nc.dds", "coads_climatology.nc.full.dmr", "coads_climatology.nc.correct.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void test_grid_rt_03()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN: " << "Testing Grid->D4Array->Grid with flat DAS." << endl);
+ i_am_broken(__func__);
+// test_roundtrip_template("coads_climatology.nc.dds", "coads_climatology.nc.full.dmr", "coads_climatology.nc.flat.das");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ CPPUNIT_TEST_SUITE (DmrRoundTripTest);
+
+ CPPUNIT_TEST (test_dds_to_dmr_to_dds_1);
+ CPPUNIT_TEST (test_dds_to_dmr_to_dds_2);
+ CPPUNIT_TEST (test_dds_to_dmr_to_dds_3);
+ CPPUNIT_TEST (test_dds_to_dmr_to_dds_4);
+ CPPUNIT_TEST (test_dds_to_dmr_to_dds_5);
+ CPPUNIT_TEST (test_grid_rt_01);
+ CPPUNIT_TEST (test_grid_rt_02);
+ CPPUNIT_TEST (test_grid_rt_03);
+
+ CPPUNIT_TEST_SUITE_END();
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (DmrRoundTripTest);
+
+int main(int argc, char *argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: DmrRoundTripTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = DmrRoundTripTest::suite()->getTests();
+ unsigned int prefix_len = DmrRoundTripTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ return 1;
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = DmrRoundTripTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+
+ return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/DmrToDap2Test.cc b/unit-tests/DmrToDap2Test.cc
new file mode 100644
index 0000000..bd2d58d
--- /dev/null
+++ b/unit-tests/DmrToDap2Test.cc
@@ -0,0 +1,493 @@
+// -*- mode: c++; c-basic-offset:4 -*-
+
+// This file is part of libdap, A C++ implementation of the OPeNDAP Data
+// Access Protocol.
+
+// Copyright (c) 2014 OPeNDAP, Inc.
+// Author: James Gallagher <jgallagher at opendap.org>
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
+
+#include "config.h"
+
+#include <cppunit/TextTestRunner.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <sstream>
+
+#include "Byte.h"
+#include "Int16.h"
+#include "UInt16.h"
+#include "Int32.h"
+#include "UInt32.h"
+#include "Float32.h"
+#include "Float64.h"
+#include "Str.h"
+#include "Url.h"
+#include "Array.h"
+#include "Structure.h"
+#include "Sequence.h"
+#include "Grid.h"
+
+#include "DDS.h"
+#include "DMR.h"
+#include "XMLWriter.h"
+#include "D4BaseTypeFactory.h"
+#include "D4ParserSax2.h"
+
+#include "GNURegex.h"
+#include "GetOpt.h"
+#include "util.h"
+#include "mime_util.h"
+#include "debug.h"
+#include "GetOpt.h"
+
+#include "testFile.h"
+#include "test_config.h"
+
+static bool debug = false;
+static bool mo_debug = false;
+
+#undef DBG
+#define DBG(x) do { if (debug) {x;} } while(false)
+
+using namespace CppUnit;
+using namespace std;
+using namespace libdap;
+
+static string THE_TESTS_DIR("/dmr-to-dap2-testsuite/");
+
+class DmrToDap2Test: public TestFixture {
+private:
+
+public:
+ DmrToDap2Test()
+ {
+ }
+ ~DmrToDap2Test()
+ {
+ }
+
+ void setUp()
+ {
+ }
+
+ void tearDown()
+ {
+ }
+
+ bool re_match(Regex &r, const string &s)
+ {
+ int match = r.match(s.c_str(), s.length());
+ DBG(cerr << "Match: " << match << " should be: " << s.length() << endl);
+ return match == static_cast<int>(s.length());
+ }
+
+ /**
+ * Given the name of a DDS and optional DAS file, build a DMR using the
+ * hackery known as transform_to_dap4 and the new DMR ctor.
+ *
+ * @param dds_file
+ * @param attr
+ * @return A pointer to the new DMR; caller must delete
+ */
+ DMR *build_dmr(const string &dmr_file)
+ {
+ DBG(cerr << __func__ << "() - BEGIN" << endl);
+ DBG(cerr << __func__ << "() - dmr_file: " << dmr_file << endl);
+
+ try {
+ DMR *dmr = new DMR();
+ dmr->set_filename(dmr_file);
+ dmr->set_name(name_path(dmr_file));
+ D4BaseTypeFactory BaseFactory; // Use the factory for this handler's types
+ dmr->set_factory(&BaseFactory);
+ D4ParserSax2 parser;
+ ifstream in(dmr_file.c_str(), ios::in);
+ parser.intern(in, dmr, mo_debug);
+ dmr->set_factory(0);
+ DBG(cerr << __func__ << "() - END" << endl);
+ return dmr;
+ }
+ catch (Error &e) {
+ CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+ }
+
+ return 0;
+ }
+
+ void test_template(const string &test_base_name)
+ {
+
+ string prefix = string(TEST_SRC_DIR) + THE_TESTS_DIR;
+
+ string dmr_file = prefix + test_base_name + ".dmr";
+ string dds_file = prefix + test_base_name + ".dds";
+ string das_file = prefix + test_base_name + ".das";
+
+ DBG(cerr << __func__ << "() - BEGIN (test_base: " << test_base_name << ")" << endl);
+ DMR *dmr = 0;
+ try {
+
+ dmr = build_dmr(dmr_file);
+ CPPUNIT_ASSERT(dmr != 0);
+ XMLWriter xml;
+ dmr->print_dap4(xml);
+ string result_dmr(xml.get_doc());
+ string baseline_dmr = readTestBaseline(dmr_file);
+
+ DBG(
+ cerr << "BASELINE DMR(" << baseline_dmr.size() << " chars): " << dmr_file << endl << baseline_dmr
+ << endl);
+ DBG(cerr << "RESULT DMR(" << result_dmr.size() << " chars): " << endl << result_dmr << endl);
+ CPPUNIT_ASSERT(result_dmr == baseline_dmr);
+
+ DDS *dds = dmr->getDDS();
+ std::ostringstream result_dds;
+ dds->print(result_dds);
+ string baseline_dds = readTestBaseline(dds_file);
+ DBG(
+ cerr << "BASELINE DDS(" << baseline_dds.size() << " chars): " << dds_file << endl << baseline_dds
+ << endl);
+ DBG(cerr << "RESULT DDS(" << result_dds.str().size() << " chars): " << endl << result_dds.str() << endl);
+ CPPUNIT_ASSERT(result_dds.str() == baseline_dds);
+
+ std::ostringstream result_das;
+ dds->print_das(result_das);
+ string source_das = readTestBaseline(das_file);
+ DBG(cerr << "BASELINE DAS(" << source_das.size() << " chars): " << das_file << endl << source_das << endl);
+ DBG(cerr << "RESULT DAS(" << result_das.str().size() << " chars): " << endl << result_das.str() << endl);
+ CPPUNIT_ASSERT(result_das.str() == source_das);
+
+ delete dmr;
+ delete dds;
+ }
+ catch (Error &e) {
+ delete dmr;
+ CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
+ }
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ // Test a DDS with simple scalar types and no attributes
+ void dmr_to_dap2_01()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("test.1");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ // Test a DDS with simple scalar types and no attributes
+ void basic_dmr_to_dap2_0_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_0.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void basic_dmr_to_dap2_0_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_0.1");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void basic_dmr_to_dap2_1_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_1.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void basic_dmr_to_dap2_2_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_2.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void basic_dmr_to_dap2_2_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_2.1");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void basic_dmr_to_dap2_2_2()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_2.2");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void basic_dmr_to_dap2_2_3()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_2.3");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void basic_dmr_to_dap2_2_4()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_2.4");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void basic_dmr_to_dap2_2_5()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_2.5");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void basic_dmr_to_dap2_3_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("DMR_3.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void enum_dmr_to_dap2_0_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_0.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void enum_dmr_to_dap2_0_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_0.1");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void enum_dmr_to_dap2_1_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_1.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void enum_dmr_to_dap2_1_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_1.1");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void enum_dmr_to_dap2_1_2()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_1.2");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void enum_dmr_to_dap2_1_3()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_1.3");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void enum_dmr_to_dap2_1_4()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_1.4");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void enum_dmr_to_dap2_1_5()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_1.5");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void enum_dmr_to_dap2_2_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_2.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void enum_dmr_to_dap2_2_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_2.1");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void enum_dmr_to_dap2_3_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_3.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void enum_dmr_to_dap2_3_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_3.1");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void enum_dmr_to_dap2_4_0()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_4.0");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void enum_dmr_to_dap2_4_1()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_4.1");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+ void enum_dmr_to_dap2_4_2()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("EnumDMR_4.2");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void dmr_to_grid_01()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("coads_climatology.nc");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void dmr_to_grid_02()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("sst.mnmean.nc.gz");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void dmr_to_grid_03()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("sresa1b_ncar_ccsm3_0_run1_200001.nc");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void dmr_to_grid_04()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("tos_O1_2001-2002.nc");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ void dmr_to_grid_05()
+ {
+ DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
+ test_template("cami_0000-09-01_64x128_L26_c030918.nc");
+ DBG(cerr << __func__ << "() - END" << endl);
+ }
+
+ CPPUNIT_TEST_SUITE (DmrToDap2Test);
+
+#if 1 // good (as in should be working) tests
+ CPPUNIT_TEST (dmr_to_dap2_01);
+ CPPUNIT_TEST (basic_dmr_to_dap2_0_0);
+ CPPUNIT_TEST (basic_dmr_to_dap2_0_1);
+ CPPUNIT_TEST (basic_dmr_to_dap2_2_0);
+ CPPUNIT_TEST (basic_dmr_to_dap2_2_1);
+ CPPUNIT_TEST (basic_dmr_to_dap2_2_2);
+ CPPUNIT_TEST (basic_dmr_to_dap2_2_4);
+ CPPUNIT_TEST (basic_dmr_to_dap2_2_3);
+ CPPUNIT_TEST (basic_dmr_to_dap2_2_5); // Drops Variables
+
+ CPPUNIT_TEST (enum_dmr_to_dap2_0_0);
+ CPPUNIT_TEST (enum_dmr_to_dap2_0_1);
+ CPPUNIT_TEST (enum_dmr_to_dap2_1_0);
+ CPPUNIT_TEST (enum_dmr_to_dap2_1_1);
+ CPPUNIT_TEST (enum_dmr_to_dap2_1_2);
+ CPPUNIT_TEST (enum_dmr_to_dap2_1_3);
+ CPPUNIT_TEST (enum_dmr_to_dap2_1_4);
+ CPPUNIT_TEST (enum_dmr_to_dap2_2_0); // Drops Variables
+ CPPUNIT_TEST (enum_dmr_to_dap2_2_1); // Drops Variables
+ CPPUNIT_TEST (enum_dmr_to_dap2_3_0); // Drops Variables
+ CPPUNIT_TEST (enum_dmr_to_dap2_3_1); // Drops Variables
+
+ CPPUNIT_TEST (enum_dmr_to_dap2_4_0); // Drops Groups
+ CPPUNIT_TEST (enum_dmr_to_dap2_4_1); // Drops Groups
+ CPPUNIT_TEST (enum_dmr_to_dap2_4_1);
+ CPPUNIT_TEST (enum_dmr_to_dap2_4_2);
+
+ CPPUNIT_TEST (dmr_to_grid_01);
+ CPPUNIT_TEST (dmr_to_grid_02);
+ CPPUNIT_TEST (dmr_to_grid_03);
+ CPPUNIT_TEST (dmr_to_grid_04);
+ CPPUNIT_TEST (dmr_to_grid_05);
+
+#endif
+
+#if 0 // bad tests, here then is the woodshed of Testville.
+
+ CPPUNIT_TEST(enum_dmr_to_dap2_1_5); // Broken: Parser issue with look-ahead
+
+#endif
+
+ CPPUNIT_TEST_SUITE_END();
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (DmrToDap2Test);
+
+int main(int argc, char *argv[])
+{
+ GetOpt getopt(argc, argv, "dDh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'D':
+ mo_debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: DmrToDap2Test has the following tests:" << endl;
+ const std::vector<Test*> &tests = DmrToDap2Test::suite()->getTests();
+ unsigned int prefix_len = DmrToDap2Test::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = DmrToDap2Test::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+
+ return wasSuccessful ? 0 : 1;
+}
+
diff --git a/unit-tests/HTTPCacheTest.cc b/unit-tests/HTTPCacheTest.cc
index 2fd3b08..544164e 100644
--- a/unit-tests/HTTPCacheTest.cc
+++ b/unit-tests/HTTPCacheTest.cc
@@ -102,7 +102,8 @@ private:
protected:
public:
- HTTPCacheTest() : hc(0), http_conn(0)
+ HTTPCacheTest() :
+ hc(0), http_conn(0)
{
putenv((char*) "DODS_CONF=./cache-testsuite/dodsrc");
http_conn = new HTTPConnect(RCReader::instance());
@@ -111,7 +112,7 @@ public:
hash_value = 656;
localhost_url = "http://test.opendap.org/test-304.html";
index_file_line =
- "http://test.opendap.org/test-304.html cache-testsuite/dods_cache/656/dodsKbcD0h \"3f62c-157-139c2680\" 1121283146 -1 343 0 656 1 7351 1121360379 3723 0";
+ "http://test.opendap.org/test-304.html cache-testsuite/dods_cache/656/dodsKbcD0h \"3f62c-157-139c2680\" 1121283146 -1 343 0 656 1 7351 1121360379 3723 0";
expired = "http://test.opendap.org/cgi-bin/expires.sh";
@@ -156,43 +157,43 @@ public:
DBG2(cerr << "exiting tearDown" << endl);
}
- CPPUNIT_TEST_SUITE(HTTPCacheTest);
-
- CPPUNIT_TEST(constructor_test);
- CPPUNIT_TEST(cache_index_read_test);
- CPPUNIT_TEST(cache_index_parse_line_test);
- CPPUNIT_TEST(get_entry_from_cache_table_test);
- CPPUNIT_TEST(cache_index_write_test);
- CPPUNIT_TEST(create_cache_root_test);
- CPPUNIT_TEST(set_cache_root_test);
- CPPUNIT_TEST(get_single_user_lock_test);
-
- CPPUNIT_TEST(release_single_user_lock_test);
- CPPUNIT_TEST(create_hash_directory_test);
- CPPUNIT_TEST(create_location_test);
- CPPUNIT_TEST(parse_headers_test);
-
- CPPUNIT_TEST(calculate_time_test);
- CPPUNIT_TEST(write_metadata_test);
- CPPUNIT_TEST(cache_response_test);
+ CPPUNIT_TEST_SUITE (HTTPCacheTest);
+
+ CPPUNIT_TEST (constructor_test);
+ CPPUNIT_TEST (cache_index_read_test);
+ CPPUNIT_TEST (cache_index_parse_line_test);
+ CPPUNIT_TEST (get_entry_from_cache_table_test);
+ CPPUNIT_TEST (cache_index_write_test);
+ CPPUNIT_TEST (create_cache_root_test);
+ CPPUNIT_TEST (set_cache_root_test);
+ CPPUNIT_TEST (get_single_user_lock_test);
+
+ CPPUNIT_TEST (release_single_user_lock_test);
+ CPPUNIT_TEST (create_hash_directory_test);
+ CPPUNIT_TEST (create_location_test);
+ CPPUNIT_TEST (parse_headers_test);
+
+ CPPUNIT_TEST (calculate_time_test);
+ CPPUNIT_TEST (write_metadata_test);
+ CPPUNIT_TEST (cache_response_test);
#if 0
// This test does not seem to work in New Zealand - maybe because
// of the dateline??? jhrg 1/31/13
CPPUNIT_TEST(is_url_valid_test);
#endif
- CPPUNIT_TEST(get_cached_response_test);
+ CPPUNIT_TEST (get_cached_response_test);
- CPPUNIT_TEST(perform_garbage_collection_test);
- CPPUNIT_TEST(purge_cache_and_release_cached_response_test);
- CPPUNIT_TEST(get_conditional_response_headers_test);
- CPPUNIT_TEST(update_response_test);
- CPPUNIT_TEST(cache_gc_test);
+ CPPUNIT_TEST (perform_garbage_collection_test);
+ CPPUNIT_TEST (purge_cache_and_release_cached_response_test);
+ CPPUNIT_TEST (get_conditional_response_headers_test);
+ CPPUNIT_TEST (update_response_test);
+ CPPUNIT_TEST (cache_gc_test);
// Make this the last test because when distcheck is run, running
// it before other tests will break them.
- CPPUNIT_TEST(instance_test);
+ CPPUNIT_TEST (instance_test);
- CPPUNIT_TEST_SUITE_END() ;
+ CPPUNIT_TEST_SUITE_END();
void constructor_test()
{
@@ -273,7 +274,7 @@ public:
try {
HTTPCache * hc_3 = new HTTPCache("cache-testsuite/dods_cache/", true);
hc_3->d_http_cache_table->add_entry_to_cache_table(
- hc->d_http_cache_table->cache_index_parse_line(index_file_line.c_str()));
+ hc->d_http_cache_table->cache_index_parse_line(index_file_line.c_str()));
hc_3->d_http_cache_table->d_cache_index = hc->d_cache_root + "test_index";
hc_3->d_http_cache_table->cache_index_write();
@@ -499,7 +500,7 @@ public:
// headers and cached_headers should match, except for the values.
vector<string>::iterator i, j;
for (i = cached_headers.begin(), j = headers->begin(); i != cached_headers.end() && j != headers->end();
- ++i, ++j) {
+ ++i, ++j) {
string ch = (*i).substr(0, (*i).find(": "));
// Skip over headers that won't be cached. jhrg 7/4/05
while (is_hop_by_hop_header(*j))
@@ -528,8 +529,7 @@ public:
int cn = fread(&cb, 1, 1, cached_body);
int n = fread(&b, 1, 1, rs->get_stream());
CPPUNIT_ASSERT(cn == n);
- if (cn == 1)
- CPPUNIT_ASSERT(cb == b);
+ if (cn == 1) CPPUNIT_ASSERT(cb == b);
}
CPPUNIT_ASSERT(feof(rs->get_stream()) && feof(cached_body));
@@ -564,7 +564,7 @@ public:
gc->d_http_cache_table->cache_index_write();
CPPUNIT_ASSERT(
- !gc->is_url_in_cache(expired) && "This may fail if sleep is not long enough before gc above");
+ !gc->is_url_in_cache(expired) && "This may fail if sleep is not long enough before gc above");
}
catch (Error &e) {
cerr << "Exception: " << e.get_error_message() << endl;
@@ -865,25 +865,31 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION(HTTPCacheTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (HTTPCacheTest);
} // namespace libdap
int main(int argc, char*argv[])
{
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
- case 'd':
- debug = 1; // debug is a static global
- break;
- default:
- break;
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: HTTPCacheTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::HTTPCacheTest::suite()->getTests();
+ unsigned int prefix_len = libdap::HTTPCacheTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
}
// Run cleanup here, so that the first run works (since this code now
@@ -891,6 +897,9 @@ int main(int argc, char*argv[])
// This gives valgrind fits...
system("cd cache-testsuite && ./cleanup.sh");
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -899,9 +908,9 @@ int main(int argc, char*argv[])
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::HTTPCacheTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::HTTPCacheTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/HTTPConnectTest.cc b/unit-tests/HTTPConnectTest.cc
index 840617d..c732196 100644
--- a/unit-tests/HTTPConnectTest.cc
+++ b/unit-tests/HTTPConnectTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -51,11 +50,10 @@ static bool debug = false;
#undef DBG
#define DBG(x) do { if (debug) (x); } while(false);
-namespace libdap
-{
+namespace libdap {
class HTTPConnectTest: public TestFixture {
- private:
+private:
HTTPConnect * http;
string localhost_url, localhost_pw_url, localhost_digest_pw_url;
string etag;
@@ -64,16 +62,23 @@ class HTTPConnectTest: public TestFixture {
// char env_data[128];
- protected:
- bool re_match(Regex & r, const char *s) {
+protected:
+ bool re_match(Regex & r, const char *s)
+ {
return r.match(s, strlen(s)) == (int) strlen(s);
}
struct REMatch: public unary_function<const string &, bool> {
Regex &d_re;
- REMatch(Regex &re) : d_re(re) {}
- ~REMatch() {}
- bool operator()(const string &str) {
+ REMatch(Regex &re) :
+ d_re(re)
+ {
+ }
+ ~REMatch()
+ {
+ }
+ bool operator()(const string &str)
+ {
const char *s = str.c_str();
return d_re.match(s, strlen(s)) == (int) strlen(s);
}
@@ -81,18 +86,29 @@ class HTTPConnectTest: public TestFixture {
// This is defined in HTTPConnect.cc but has to be defined here as well.
// Don't know why... jhrg
- class HeaderMatch : public unary_function<const string &, bool> {
+ class HeaderMatch: public unary_function<const string &, bool> {
const string &d_header;
- public:
- HeaderMatch(const string &header) : d_header(header) {}
- bool operator()(const string &arg) { return arg.find(d_header) == 0; }
+ public:
+ HeaderMatch(const string &header) :
+ d_header(header)
+ {
+ }
+ bool operator()(const string &arg)
+ {
+ return arg.find(d_header) == 0;
+ }
};
- public:
- HTTPConnectTest() { }
- ~HTTPConnectTest() { }
+public:
+ HTTPConnectTest()
+ {
+ }
+ ~HTTPConnectTest()
+ {
+ }
- void setUp() {
+ void setUp()
+ {
DBG(cerr << "Setting the DODS_CONF env var" << endl);
setenv("DODS_CONF", "cache-testsuite/dodsrc", 1);
http = new HTTPConnect(RCReader::instance());
@@ -108,15 +124,13 @@ class HTTPConnectTest: public TestFixture {
etag = "\"181893-157-3fbcd139c2680\""; //"\"2a008e-157-3fbcd139c2680\""; //\"a10df-157-139c2680\""; // a10df-157-139c2680a
lm = "Wed, 13 Jul 2005 19:32:26 GMT";
- localhost_pw_url =
- "http://jimg:dods_test@test.opendap.org/basic/page.txt";
- localhost_digest_pw_url =
- "http://jimg:dods_digest@test.opendap.org/digest/page.txt";
- netcdf_das_url =
- "http://test.opendap.org/dap/data/nc/fnoc1.nc.das";
+ localhost_pw_url = "http://jimg:dods_test@test.opendap.org/basic/page.txt";
+ localhost_digest_pw_url = "http://jimg:dods_digest@test.opendap.org/digest/page.txt";
+ netcdf_das_url = "http://test.opendap.org/dap/data/nc/fnoc1.nc.das";
}
- void tearDown() {
+ void tearDown()
+ {
// normal code doesn't do this - it happens at exit() but not doing
// this here make valgrind think there are leaks.
http->d_http_cache->delete_instance();
@@ -125,55 +139,55 @@ class HTTPConnectTest: public TestFixture {
unsetenv("DODS_CONF");
}
- CPPUNIT_TEST_SUITE(HTTPConnectTest);
+ CPPUNIT_TEST_SUITE (HTTPConnectTest);
- CPPUNIT_TEST(read_url_test);
+ CPPUNIT_TEST (read_url_test);
- CPPUNIT_TEST(fetch_url_test_1);
- CPPUNIT_TEST(fetch_url_test_2);
- CPPUNIT_TEST(fetch_url_test_3);
- CPPUNIT_TEST(fetch_url_test_4);
+ CPPUNIT_TEST (fetch_url_test_1);
+ CPPUNIT_TEST (fetch_url_test_2);
+ CPPUNIT_TEST (fetch_url_test_3);
+ CPPUNIT_TEST (fetch_url_test_4);
- CPPUNIT_TEST(fetch_url_test_1_cpp);
- CPPUNIT_TEST(fetch_url_test_2_cpp);
- CPPUNIT_TEST(fetch_url_test_3_cpp);
- CPPUNIT_TEST(fetch_url_test_4_cpp);
+ CPPUNIT_TEST (fetch_url_test_1_cpp);
+ CPPUNIT_TEST (fetch_url_test_2_cpp);
+ CPPUNIT_TEST (fetch_url_test_3_cpp);
+ CPPUNIT_TEST (fetch_url_test_4_cpp);
- CPPUNIT_TEST(get_response_headers_test);
- CPPUNIT_TEST(server_version_test);
- CPPUNIT_TEST(type_test);
+ CPPUNIT_TEST (get_response_headers_test);
+ CPPUNIT_TEST (server_version_test);
+ CPPUNIT_TEST (type_test);
- CPPUNIT_TEST(cache_test);
- CPPUNIT_TEST(cache_test_cpp);
+ CPPUNIT_TEST (cache_test);
+ CPPUNIT_TEST (cache_test_cpp);
- CPPUNIT_TEST(set_accept_deflate_test);
- CPPUNIT_TEST(set_xdap_protocol_test);
- CPPUNIT_TEST(read_url_password_test);
- CPPUNIT_TEST(read_url_password_test2);
+ CPPUNIT_TEST (set_accept_deflate_test);
+ CPPUNIT_TEST (set_xdap_protocol_test);
+ CPPUNIT_TEST (read_url_password_test);
+ CPPUNIT_TEST (read_url_password_test2);
- // CPPUNIT_TEST(read_url_password_proxy_test);
+ // CPPUNIT_TEST(read_url_password_proxy_test);
CPPUNIT_TEST_SUITE_END();
- void read_url_test() {
- vector < string > *resp_h = new vector < string >;;
+ void read_url_test()
+ {
+ vector<string> *resp_h = new vector<string>;
+ ;
try {
- DBG(cerr << "Entering read_url_test... " << endl);
+ DBG(cerr << "Entering read_url_test... " << endl);
FILE *dump = fopen("/dev/null", "w");
long status = http->read_url(localhost_url, dump, resp_h);
CPPUNIT_ASSERT(status == 200);
- vector < string > request_h;
+ vector<string> request_h;
// First test using a time with if-modified-since
request_h.push_back(string("If-Modified-Since: ") + lm);
- status =
- http->read_url(localhost_url, dump, resp_h, &request_h);
+ status = http->read_url(localhost_url, dump, resp_h, &request_h);
DBG(cerr << "If modified since test, status: " << status << endl);
- DBG(copy(resp_h->begin(), resp_h->end(),
- ostream_iterator < string > (cerr, "\n")));
+ DBG(copy(resp_h->begin(), resp_h->end(), ostream_iterator<string>(cerr, "\n")));
DBG(cerr << endl);
CPPUNIT_ASSERT(status == 304);
@@ -181,11 +195,9 @@ class HTTPConnectTest: public TestFixture {
resp_h->clear();
request_h.clear();
request_h.push_back(string("If-None-Match: ") + etag);
- status =
- http->read_url(localhost_url, dump, resp_h, &request_h);
+ status = http->read_url(localhost_url, dump, resp_h, &request_h);
DBG(cerr << "If none match test, status: " << status << endl);
- DBG(copy(resp_h->begin(), resp_h->end(),
- ostream_iterator < string > (cerr, "\n")));
+ DBG(copy(resp_h->begin(), resp_h->end(), ostream_iterator<string>(cerr, "\n")));
DBG(cerr << endl);
CPPUNIT_ASSERT(status == 304);
@@ -194,43 +206,42 @@ class HTTPConnectTest: public TestFixture {
request_h.clear();
request_h.push_back(string("If-None-Match: ") + etag);
request_h.push_back(string("If-Modified-Since: ") + lm);
- status =
- http->read_url(localhost_url, dump, resp_h, &request_h);
+ status = http->read_url(localhost_url, dump, resp_h, &request_h);
DBG(cerr << "Combined test, status: " << status << endl);
- DBG(copy(resp_h->begin(), resp_h->end(),
- ostream_iterator < string > (cerr, "\n")));
+ DBG(copy(resp_h->begin(), resp_h->end(), ostream_iterator<string>(cerr, "\n")));
CPPUNIT_ASSERT(status == 304);
delete resp_h;
resp_h = 0;
}
- catch(Error & e) {
+ catch (Error & e) {
delete resp_h;
resp_h = 0;
- CPPUNIT_FAIL("Error: " + e.get_error_message() );
+ CPPUNIT_FAIL("Error: " + e.get_error_message());
}
}
- void fetch_url_test_1() {
+ void fetch_url_test_1()
+ {
DBG(cerr << "Entering fetch_url_test 1" << endl);
HTTPResponse *stuff = 0;
char c;
try {
stuff = http->fetch_url(localhost_url);
- CPPUNIT_ASSERT(fread(&c, 1, 1, stuff->get_stream()) == 1
- && !ferror(stuff->get_stream())
- && !feof(stuff->get_stream()));
+ CPPUNIT_ASSERT(
+ fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+ && !feof(stuff->get_stream()));
delete stuff;
stuff = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
}
- catch(Error & e) {
+ catch (Error & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
@@ -241,12 +252,14 @@ class HTTPConnectTest: public TestFixture {
// entries
catch (...) {
cerr << "Caught unknown exception" << endl;
- delete stuff; stuff = 0;
+ delete stuff;
+ stuff = 0;
throw;
}
}
- void fetch_url_test_1_cpp() {
+ void fetch_url_test_1_cpp()
+ {
DBG(cerr << "Entering fetch_url_test 1" << endl);
HTTPResponse *stuff = 0;
http->set_use_cpp_streams(true);
@@ -260,15 +273,15 @@ class HTTPConnectTest: public TestFixture {
delete stuff;
}
- catch(InternalErr &e) {
+ catch (InternalErr &e) {
delete stuff;
CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
}
- catch(Error &e) {
+ catch (Error &e) {
delete stuff;
CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
}
- catch(std::exception &e) {
+ catch (std::exception &e) {
delete stuff;
CPPUNIT_FAIL(string("Caught an std::exception from fetch_url: ") + e.what());
}
@@ -283,28 +296,29 @@ class HTTPConnectTest: public TestFixture {
}
}
- void fetch_url_test_2() {
+ void fetch_url_test_2()
+ {
DBG(cerr << "Entering fetch_url_test 2" << endl);
HTTPResponse *stuff = 0;
char c;
try {
stuff = http->fetch_url(netcdf_das_url);
DBG2(char ln[1024]; while (!feof(stuff->get_stream())) {
- fgets(ln, 1024, stuff->get_stream()); cerr << ln;}
- rewind(stuff->get_stream()));
+ fgets(ln, 1024, stuff->get_stream()); cerr << ln;}
+ rewind(stuff->get_stream()));
- CPPUNIT_ASSERT(fread(&c, 1, 1, stuff->get_stream()) == 1
- && !ferror(stuff->get_stream())
- && !feof(stuff->get_stream()));
+ CPPUNIT_ASSERT(
+ fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+ && !feof(stuff->get_stream()));
delete stuff;
stuff = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
}
- catch(Error & e) {
+ catch (Error & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
@@ -314,68 +328,70 @@ class HTTPConnectTest: public TestFixture {
// is not called, then a failed test can leave the cache with locked
// entries
catch (...) {
- delete stuff; stuff = 0;
+ delete stuff;
+ stuff = 0;
throw;
}
}
- void fetch_url_test_2_cpp() {
- DBG(cerr << "Entering fetch_url_test 2" << endl);
- http->set_use_cpp_streams(true);
+ void fetch_url_test_2_cpp()
+ {
+ DBG(cerr << "Entering fetch_url_test 2" << endl);
+ http->set_use_cpp_streams(true);
- HTTPResponse *stuff = 0;
- char c;
+ HTTPResponse *stuff = 0;
+ char c;
- try {
- stuff = http->fetch_url(netcdf_das_url);
+ try {
+ stuff = http->fetch_url(netcdf_das_url);
stuff->get_cpp_stream()->read(&c, 1);
- CPPUNIT_ASSERT(*(stuff->get_cpp_stream())
- && !stuff->get_cpp_stream()->bad()
- && !stuff->get_cpp_stream()->eof());
-
- delete stuff;
- stuff = 0;
- }
- catch (InternalErr & e) {
- delete stuff;
- stuff = 0;
- CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
- }
- catch (Error & e) {
- delete stuff;
- stuff = 0;
- CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
- }
- // Catch the exception from a failed ASSERT and clean up. Deleting a
- // Response object also unlocks the HTTPCache in some cases. If delete
- // is not called, then a failed test can leave the cache with locked
- // entries
- catch (...) {
- delete stuff;
- stuff = 0;
- throw;
- }
- }
-
- void fetch_url_test_3() {
+ CPPUNIT_ASSERT(
+ *(stuff->get_cpp_stream()) && !stuff->get_cpp_stream()->bad() && !stuff->get_cpp_stream()->eof());
+
+ delete stuff;
+ stuff = 0;
+ }
+ catch (InternalErr & e) {
+ delete stuff;
+ stuff = 0;
+ CPPUNIT_FAIL("Caught an InternalErr from fetch_url: " + e.get_error_message());
+ }
+ catch (Error & e) {
+ delete stuff;
+ stuff = 0;
+ CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
+ }
+ // Catch the exception from a failed ASSERT and clean up. Deleting a
+ // Response object also unlocks the HTTPCache in some cases. If delete
+ // is not called, then a failed test can leave the cache with locked
+ // entries
+ catch (...) {
+ delete stuff;
+ stuff = 0;
+ throw;
+ }
+ }
+
+ void fetch_url_test_3()
+ {
DBG(cerr << "Entering fetch_url_test 3" << endl);
HTTPResponse *stuff = 0;
char c;
try {
stuff = http->fetch_url("file:///etc/passwd");
- CPPUNIT_ASSERT(fread(&c, 1, 1, stuff->get_stream()) == 1
- && !ferror(stuff->get_stream())
- && !feof(stuff->get_stream()));
+ CPPUNIT_ASSERT(
+ fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+ && !feof(stuff->get_stream()));
delete stuff;
stuff = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an InternalErr from fetch_url" + e.get_error_message());
}
- catch(Error & e) {
+ catch (Error & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
@@ -385,14 +401,16 @@ class HTTPConnectTest: public TestFixture {
// is not called, then a failed test can leave the cache with locked
// entries
catch (...) {
- delete stuff; stuff = 0;
+ delete stuff;
+ stuff = 0;
throw;
}
}
- void fetch_url_test_3_cpp() {
+ void fetch_url_test_3_cpp()
+ {
DBG(cerr << "Entering fetch_url_test 3" << endl);
- http->set_use_cpp_streams(true);
+ http->set_use_cpp_streams(true);
HTTPResponse *stuff = 0;
char c;
@@ -400,19 +418,18 @@ class HTTPConnectTest: public TestFixture {
stuff = http->fetch_url("file:///etc/passwd");
stuff->get_cpp_stream()->read(&c, 1);
- CPPUNIT_ASSERT(*(stuff->get_cpp_stream())
- && !stuff->get_cpp_stream()->bad()
- && !stuff->get_cpp_stream()->eof());
+ CPPUNIT_ASSERT(
+ *(stuff->get_cpp_stream()) && !stuff->get_cpp_stream()->bad() && !stuff->get_cpp_stream()->eof());
delete stuff;
stuff = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an InternalErr from fetch_url" + e.get_error_message());
}
- catch(Error & e) {
+ catch (Error & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
@@ -422,30 +439,32 @@ class HTTPConnectTest: public TestFixture {
// is not called, then a failed test can leave the cache with locked
// entries
catch (...) {
- delete stuff; stuff = 0;
+ delete stuff;
+ stuff = 0;
throw;
}
}
- void fetch_url_test_4() {
+ void fetch_url_test_4()
+ {
DBG(cerr << "Entering fetch_url_test 4" << endl);
HTTPResponse *stuff = 0;
char c;
try {
- string url = (string)"file://" + TEST_SRC_DIR + "/test_config.h" ;
+ string url = (string) "file://" + TEST_SRC_DIR + "/test_config.h";
stuff = http->fetch_url(url);
- CPPUNIT_ASSERT(fread(&c, 1, 1, stuff->get_stream()) == 1
- && !ferror(stuff->get_stream())
- && !feof(stuff->get_stream()));
+ CPPUNIT_ASSERT(
+ fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+ && !feof(stuff->get_stream()));
delete stuff;
stuff = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an InternalErr from fetch_url" + e.get_error_message());
}
- catch(Error & e) {
+ catch (Error & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
@@ -455,35 +474,36 @@ class HTTPConnectTest: public TestFixture {
// is not called, then a failed test can leave the cache with locked
// entries
catch (...) {
- delete stuff; stuff = 0;
+ delete stuff;
+ stuff = 0;
throw;
}
}
- void fetch_url_test_4_cpp() {
+ void fetch_url_test_4_cpp()
+ {
DBG(cerr << "Entering fetch_url_test 4" << endl);
- http->set_use_cpp_streams(true);
+ http->set_use_cpp_streams(true);
HTTPResponse *stuff = 0;
char c;
try {
- string url = (string)"file://" + TEST_SRC_DIR + "/test_config.h" ;
+ string url = (string) "file://" + TEST_SRC_DIR + "/test_config.h";
stuff = http->fetch_url(url);
stuff->get_cpp_stream()->read(&c, 1);
- CPPUNIT_ASSERT(*(stuff->get_cpp_stream())
- && !stuff->get_cpp_stream()->bad()
- && !stuff->get_cpp_stream()->eof());
+ CPPUNIT_ASSERT(
+ *(stuff->get_cpp_stream()) && !stuff->get_cpp_stream()->bad() && !stuff->get_cpp_stream()->eof());
delete stuff;
stuff = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an InternalErr from fetch_url" + e.get_error_message());
}
- catch(Error & e) {
+ catch (Error & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an Error from fetch_url: " + e.get_error_message());
@@ -493,20 +513,21 @@ class HTTPConnectTest: public TestFixture {
// is not called, then a failed test can leave the cache with locked
// entries
catch (...) {
- delete stuff; stuff = 0;
+ delete stuff;
+ stuff = 0;
throw;
}
}
- void get_response_headers_test() {
+ void get_response_headers_test()
+ {
HTTPResponse *r = 0;
try {
r = http->fetch_url(netcdf_das_url);
- vector < string > *h = r->get_headers();
+ vector<string> *h = r->get_headers();
- DBG(copy(h->begin(), h->end(),
- ostream_iterator < string > (cerr, "\n")));
+ DBG(copy(h->begin(), h->end(), ostream_iterator<string>(cerr, "\n")));
// Should get five or six headers back.
Regex header("X.*-Server: .*/.*");
@@ -519,43 +540,46 @@ class HTTPConnectTest: public TestFixture {
delete r;
r = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete r;
r = 0;
- CPPUNIT_FAIL("Caught an InternalErr exception from get_response_headers: " + e.get_error_message() );
+ CPPUNIT_FAIL("Caught an InternalErr exception from get_response_headers: " + e.get_error_message());
}
catch (...) {
- delete r; r = 0;
+ delete r;
+ r = 0;
throw;
}
}
- void server_version_test() {
+ void server_version_test()
+ {
Response *r = 0;
Regex protocol("^[0-9]+\\.[0-9]+$");
try {
r = http->fetch_url(netcdf_das_url);
- DBG(cerr << "r->get_version().c_str(): "
- << r->get_protocol().c_str() << endl);
+ DBG(cerr << "r->get_version().c_str(): " << r->get_protocol().c_str() << endl);
CPPUNIT_ASSERT(re_match(protocol, r->get_protocol().c_str()));
delete r;
r = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete r;
r = 0;
- CPPUNIT_FAIL("Caught an InternalErr exception from server_version: " + e.get_error_message() );
+ CPPUNIT_FAIL("Caught an InternalErr exception from server_version: " + e.get_error_message());
}
catch (...) {
- delete r; r = 0;
+ delete r;
+ r = 0;
throw;
}
}
- void type_test() {
+ void type_test()
+ {
Response *r = 0;
try {
r = http->fetch_url(netcdf_das_url);
@@ -564,143 +588,139 @@ class HTTPConnectTest: public TestFixture {
delete r;
r = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete r;
r = 0;
- CPPUNIT_FAIL("Caught an InternalErr exception from type(): " + e.get_error_message() );
+ CPPUNIT_FAIL("Caught an InternalErr exception from type(): " + e.get_error_message());
}
}
- void set_credentials_test() {
+ void set_credentials_test()
+ {
http->set_credentials("jimg", "was_quit");
Response *stuff = http->fetch_url("http://localhost/secret");
try {
char c;
- CPPUNIT_ASSERT(fread(&c, 1, 1, stuff->get_stream()) == 1
- && !ferror(stuff->get_stream())
- && !feof(stuff->get_stream()));
+ CPPUNIT_ASSERT(
+ fread(&c, 1, 1, stuff->get_stream()) == 1 && !ferror(stuff->get_stream())
+ && !feof(stuff->get_stream()));
delete stuff;
stuff = 0;
}
- catch(InternalErr & e) {
+ catch (InternalErr & e) {
delete stuff;
stuff = 0;
CPPUNIT_FAIL("Caught an InternalErrexception from output: " + e.get_error_message());
}
}
- void cache_test()
- {
- DBG(cerr << endl << "Entering Caching tests." << endl);
- try {
- // The cache-testsuite/dodsrc file turns this off; all the other
- // params are set up. It used to be that HTTPConnect had an option to
- // turn caching on, but that no longer is present. This hack enables
- // caching for this test. 06/18/04 jhrg
- http->d_http_cache = HTTPCache::instance(http->d_rcr->get_dods_cache_root(), true);
- DBG(cerr << "Instantiate the cache" << endl);
-
- CPPUNIT_ASSERT(http->d_http_cache != 0);
- http->d_http_cache->set_cache_enabled(true);
- DBG(cerr << "Enable the cache" << endl);
-
- fetch_url_test_4();
- DBG(cerr << "fetch_url_test" << endl);
- get_response_headers_test();
- DBG(cerr << "get_response_headers_test" << endl);
- server_version_test();
- DBG(cerr << "server_version_test" << endl);
- type_test();
- DBG(cerr << "type_test" << endl);
- }
- catch (Error &e) {
- CPPUNIT_FAIL((string )"Error: " + e.get_error_message());
- }
- }
-
- void cache_test_cpp()
- {
- DBG(cerr << endl << "Entering Caching tests." << endl);
- try {
- // The cache-testsuite/dodsrc file turns this off; all the other
- // params are set up. It used to be that HTTPConnect had an option to
- // turn caching on, but that no longer is present. This hack enables
- // caching for this test. 06/18/04 jhrg
- http->d_http_cache = HTTPCache::instance(http->d_rcr->get_dods_cache_root(), true);
- DBG(cerr << "Instantiate the cache" << endl);
-
- CPPUNIT_ASSERT(http->d_http_cache != 0);
- http->d_http_cache->set_cache_enabled(true);
- DBG(cerr << "Enable the cache" << endl);
-
- fetch_url_test_4_cpp();
- DBG(cerr << "fetch_url_test_4_cpp" << endl);
-
- get_response_headers_test();
- DBG(cerr << "get_response_headers_test" << endl);
-
- server_version_test();
- DBG(cerr << "server_version_test" << endl);
-
- type_test();
- DBG(cerr << "type_test" << endl);
- }
- catch (Error &e) {
- CPPUNIT_FAIL((string )"Error: " + e.get_error_message());
- }
- }
-
- void set_accept_deflate_test() {
+ void cache_test()
+ {
+ DBG(cerr << endl << "Entering Caching tests." << endl);
+ try {
+ // The cache-testsuite/dodsrc file turns this off; all the other
+ // params are set up. It used to be that HTTPConnect had an option to
+ // turn caching on, but that no longer is present. This hack enables
+ // caching for this test. 06/18/04 jhrg
+ http->d_http_cache = HTTPCache::instance(http->d_rcr->get_dods_cache_root(), true);
+ DBG(cerr << "Instantiate the cache" << endl);
+
+ CPPUNIT_ASSERT(http->d_http_cache != 0);
+ http->d_http_cache->set_cache_enabled(true);
+ DBG(cerr << "Enable the cache" << endl);
+
+ fetch_url_test_4();
+ DBG(cerr << "fetch_url_test" << endl);
+ get_response_headers_test();
+ DBG(cerr << "get_response_headers_test" << endl);
+ server_version_test();
+ DBG(cerr << "server_version_test" << endl);
+ type_test();
+ DBG(cerr << "type_test" << endl);
+ }
+ catch (Error &e) {
+ CPPUNIT_FAIL((string) "Error: " + e.get_error_message());
+ }
+ }
+
+ void cache_test_cpp()
+ {
+ DBG(cerr << endl << "Entering Caching tests." << endl);
+ try {
+ // The cache-testsuite/dodsrc file turns this off; all the other
+ // params are set up. It used to be that HTTPConnect had an option to
+ // turn caching on, but that no longer is present. This hack enables
+ // caching for this test. 06/18/04 jhrg
+ http->d_http_cache = HTTPCache::instance(http->d_rcr->get_dods_cache_root(), true);
+ DBG(cerr << "Instantiate the cache" << endl);
+
+ CPPUNIT_ASSERT(http->d_http_cache != 0);
+ http->d_http_cache->set_cache_enabled(true);
+ DBG(cerr << "Enable the cache" << endl);
+
+ fetch_url_test_4_cpp();
+ DBG(cerr << "fetch_url_test_4_cpp" << endl);
+
+ get_response_headers_test();
+ DBG(cerr << "get_response_headers_test" << endl);
+
+ server_version_test();
+ DBG(cerr << "server_version_test" << endl);
+
+ type_test();
+ DBG(cerr << "type_test" << endl);
+ }
+ catch (Error &e) {
+ CPPUNIT_FAIL((string) "Error: " + e.get_error_message());
+ }
+ }
+
+ void set_accept_deflate_test()
+ {
http->set_accept_deflate(false);
- CPPUNIT_ASSERT(count(http->d_request_headers.begin(),
- http->d_request_headers.end(),
- "Accept-Encoding: deflate, gzip, compress") == 0);
+ CPPUNIT_ASSERT(
+ count(http->d_request_headers.begin(), http->d_request_headers.end(),
+ "Accept-Encoding: deflate, gzip, compress") == 0);
http->set_accept_deflate(true);
- CPPUNIT_ASSERT(count(http->d_request_headers.begin(),
- http->d_request_headers.end(),
- "Accept-Encoding: deflate, gzip, compress") == 1);
+ CPPUNIT_ASSERT(
+ count(http->d_request_headers.begin(), http->d_request_headers.end(),
+ "Accept-Encoding: deflate, gzip, compress") == 1);
http->set_accept_deflate(true);
- CPPUNIT_ASSERT(count(http->d_request_headers.begin(),
- http->d_request_headers.end(),
- "Accept-Encoding: deflate, gzip, compress") == 1);
+ CPPUNIT_ASSERT(
+ count(http->d_request_headers.begin(), http->d_request_headers.end(),
+ "Accept-Encoding: deflate, gzip, compress") == 1);
http->set_accept_deflate(false);
- CPPUNIT_ASSERT(count(http->d_request_headers.begin(),
- http->d_request_headers.end(),
- "Accept-Encoding: deflate, gzip, compress") == 0);
+ CPPUNIT_ASSERT(
+ count(http->d_request_headers.begin(), http->d_request_headers.end(),
+ "Accept-Encoding: deflate, gzip, compress") == 0);
}
- void set_xdap_protocol_test() {
+ void set_xdap_protocol_test()
+ {
// Initially there should be no header and the protocol should be 2.0
- CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 2
- && http->d_dap_client_protocol_minor == 0);
+ CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 2 && http->d_dap_client_protocol_minor == 0);
- CPPUNIT_ASSERT(count_if(http->d_request_headers.begin(),
- http->d_request_headers.end(),
- HeaderMatch("XDAP-Accept:")) == 0);
+ CPPUNIT_ASSERT(
+ count_if(http->d_request_headers.begin(), http->d_request_headers.end(), HeaderMatch("XDAP-Accept:")) == 0);
http->set_xdap_protocol(8, 9);
- CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 8
- && http->d_dap_client_protocol_minor == 9);
- CPPUNIT_ASSERT(count(http->d_request_headers.begin(),
- http->d_request_headers.end(),
- "XDAP-Accept: 8.9") == 1);
+ CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 8 && http->d_dap_client_protocol_minor == 9);
+ CPPUNIT_ASSERT(count(http->d_request_headers.begin(), http->d_request_headers.end(), "XDAP-Accept: 8.9") == 1);
http->set_xdap_protocol(3, 2);
- CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 3
- && http->d_dap_client_protocol_minor == 2);
- CPPUNIT_ASSERT(count(http->d_request_headers.begin(),
- http->d_request_headers.end(),
- "XDAP-Accept: 3.2") == 1);
+ CPPUNIT_ASSERT(http->d_dap_client_protocol_major == 3 && http->d_dap_client_protocol_minor == 2);
+ CPPUNIT_ASSERT(count(http->d_request_headers.begin(), http->d_request_headers.end(), "XDAP-Accept: 3.2") == 1);
}
- void read_url_password_test() {
+ void read_url_password_test()
+ {
FILE *dump = fopen("/dev/null", "w");
- vector < string > *resp_h = new vector < string >;
+ vector<string> *resp_h = new vector<string>;
long status = http->read_url(localhost_pw_url, dump, resp_h);
DBG(cerr << endl << http->d_upstring << endl);
@@ -711,11 +731,11 @@ class HTTPConnectTest: public TestFixture {
resp_h = 0;
}
- void read_url_password_test2() {
+ void read_url_password_test2()
+ {
FILE *dump = fopen("/dev/null", "w");
- vector < string > *resp_h = new vector < string >;
- long status =
- http->read_url(localhost_digest_pw_url, dump, resp_h);
+ vector<string> *resp_h = new vector<string>;
+ long status = http->read_url(localhost_digest_pw_url, dump, resp_h);
DBG(cerr << endl << http->d_upstring << endl);
CPPUNIT_ASSERT(http->d_upstring == "jimg:dods_digest");
@@ -726,15 +746,13 @@ class HTTPConnectTest: public TestFixture {
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(HTTPConnectTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (HTTPConnectTest);
}
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
@@ -742,10 +760,22 @@ int main(int argc, char*argv[]) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: HTTPConnectTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::HTTPConnectTest::suite()->getTests();
+ unsigned int prefix_len = libdap::HTTPConnectTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -754,9 +784,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::HTTPConnectTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::HTTPConnectTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/MIMEUtilTest.cc b/unit-tests/MIMEUtilTest.cc
index 0cb1e65..75f43c6 100644
--- a/unit-tests/MIMEUtilTest.cc
+++ b/unit-tests/MIMEUtilTest.cc
@@ -38,7 +38,7 @@
#include <string>
#include <sstream>
-//#define DODS_DEBUG
+#include "GetOpt.h"
#include "GNURegex.h"
@@ -51,15 +51,17 @@ using namespace CppUnit;
using namespace std;
using namespace libdap;
+static bool debug = false;
+
class cgiUtilTest: public TestFixture {
private:
protected:
bool re_match(Regex &r, const string &s)
{
- int match = r.match(s.c_str(), s.length());
- DBG(cerr << "RE Match: " << match << endl);
- return match == (int) s.length();
+ int match = r.match(s.c_str(), s.length());
+ DBG(cerr << "RE Match: " << match << endl);
+ return match == (int) s.length();
}
public:
@@ -78,36 +80,35 @@ public:
{
}
-CPPUNIT_TEST_SUITE( cgiUtilTest );
+ CPPUNIT_TEST_SUITE (cgiUtilTest);
#if 1
- CPPUNIT_TEST(name_path_test);
- CPPUNIT_TEST(set_mime_text_test);
- CPPUNIT_TEST(rfc822_date_test);
- CPPUNIT_TEST(last_modified_time_test);
- CPPUNIT_TEST(read_multipart_headers_test);
+ CPPUNIT_TEST (name_path_test);
+ CPPUNIT_TEST (set_mime_text_test);
+ CPPUNIT_TEST (rfc822_date_test);
+ CPPUNIT_TEST (last_modified_time_test);
+ CPPUNIT_TEST (read_multipart_headers_test);
#endif
- CPPUNIT_TEST(get_next_mime_header_test);
+ CPPUNIT_TEST (get_next_mime_header_test);
CPPUNIT_TEST_SUITE_END();
void name_path_test()
{
- CPPUNIT_ASSERT(name_path(string("stuff")) == "stuff");
- CPPUNIT_ASSERT(name_path(string("stuff.Z")) == "stuff.Z");
- CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff.Z")) == "stuff.Z");
- CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff.tar.Z")) == "stuff.tar.Z");
- CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff")) == "stuff");
- CPPUNIT_ASSERT(name_path(string("/usr/local/src/#usr#local#src#stuff")) == "stuff");
- CPPUNIT_ASSERT(name_path(string("/usr/local/src/#usr#local#src#stuff.hdf")) == "stuff.hdf");
- CPPUNIT_ASSERT(name_path(string("")) == "");
+ CPPUNIT_ASSERT(name_path(string("stuff")) == "stuff");
+ CPPUNIT_ASSERT(name_path(string("stuff.Z")) == "stuff.Z");
+ CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff.Z")) == "stuff.Z");
+ CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff.tar.Z")) == "stuff.tar.Z");
+ CPPUNIT_ASSERT(name_path(string("/usr/local/src/stuff")) == "stuff");
+ CPPUNIT_ASSERT(name_path(string("/usr/local/src/#usr#local#src#stuff")) == "stuff");
+ CPPUNIT_ASSERT(name_path(string("/usr/local/src/#usr#local#src#stuff.hdf")) == "stuff.hdf");
+ CPPUNIT_ASSERT(name_path(string("")) == "");
}
// See note above. jhrg 1/18/06
void set_mime_text_test()
{
- Regex
- r1(
- "HTTP/1.0 200 OK\r\n\
+ Regex r1(
+ "HTTP/1.0 200 OK\r\n\
XDODS-Server: dods-test/0.00\r\n\
XOPeNDAP-Server: dods-test/0.00\r\n\
XDAP: .*\r\n\
@@ -116,14 +117,13 @@ Last-Modified: \\1\r\n\
Content-Type: text/plain\r\n\
Content-Description: dods_das\r\n\
\r\n.*");
- ostringstream oss;
- set_mime_text(oss, dods_das, "dods-test/0.00");
- DBG(cerr << "DODS DAS" << endl << oss.str());
- CPPUNIT_ASSERT(re_match(r1, oss.str()));
-
- Regex
- r2(
- "HTTP/1.0 200 OK\r\n\
+ ostringstream oss;
+ set_mime_text(oss, dods_das, "dods-test/0.00");
+ DBG(cerr << "DODS DAS" << endl << oss.str());
+ CPPUNIT_ASSERT(re_match(r1, oss.str()));
+
+ Regex r2(
+ "HTTP/1.0 200 OK\r\n\
XDODS-Server: dods-test/0.00\r\n\
XOPeNDAP-Server: dods-test/0.00\r\n\
XDAP: .*\r\n\
@@ -133,16 +133,15 @@ Content-Type: text/plain\r\n\
Content-Description: dods_dds\r\n\
\r\n.*");
- oss.str("");
- set_mime_text(oss, dods_dds, "dods-test/0.00");
- DBG(cerr << "DODS DDS" << endl << oss);
- CPPUNIT_ASSERT(re_match(r2, oss.str()));
+ oss.str("");
+ set_mime_text(oss, dods_dds, "dods-test/0.00");
+ DBG(cerr << "DODS DDS" << endl << oss);
+ CPPUNIT_ASSERT(re_match(r2, oss.str()));
- struct tm tm = { 0, 0, 0, 1, 0, 100, 0, 0, 0, 0, 0 }; // 1 Jan 2000
- time_t t = mktime(&tm);
- Regex
- r3(
- "HTTP/1.0 200 OK\r\n\
+ struct tm tm = { 0, 0, 0, 1, 0, 100, 0, 0, 0, 0, 0 }; // 1 Jan 2000
+ time_t t = mktime(&tm);
+ Regex r3(
+ "HTTP/1.0 200 OK\r\n\
XDODS-Server: dods-test/0.00\r\n\
XOPeNDAP-Server: dods-test/0.00\r\n\
XDAP: .*\r\n\
@@ -152,85 +151,115 @@ Content-Type: text/plain\r\n\
Content-Description: dods_dds\r\n\
\r\n.*");
- oss.str("");
- set_mime_text(oss, dods_dds, "dods-test/0.00", x_plain, t);
- DBG(cerr << "set_mime_text_test: oss: " << oss.str() << endl);
- CPPUNIT_ASSERT(re_match(r3, oss.str()));
+ oss.str("");
+ set_mime_text(oss, dods_dds, "dods-test/0.00", x_plain, t);
+ DBG(cerr << "set_mime_text_test: oss: " << oss.str() << endl);
+ CPPUNIT_ASSERT(re_match(r3, oss.str()));
}
void rfc822_date_test()
{
- time_t t = 0;
- CPPUNIT_ASSERT(rfc822_date(t) == "Thu, 01 Jan 1970 00:00:00 GMT");
- struct tm tm = { 0, 0, 0, 1, 0, 100, 0, 0, 0, 0, 0 }; // 1 Jan 2000
- t = mktime(&tm);
- // This test may fail for some locations since mktime interprets t as
- // the local time and returns the corresponding GMT time.
- Regex r1("(Sat, 01 Jan 2000 ..:00:00 GMT|Fri, 31 Dec 1999 ..:00:00 GMT)");
- CPPUNIT_ASSERT(re_match(r1, rfc822_date(t)));
+ time_t t = 0;
+ CPPUNIT_ASSERT(rfc822_date(t) == "Thu, 01 Jan 1970 00:00:00 GMT");
+ struct tm tm = { 0, 0, 0, 1, 0, 100, 0, 0, 0, 0, 0 }; // 1 Jan 2000
+ t = mktime(&tm);
+ // This test may fail for some locations since mktime interprets t as
+ // the local time and returns the corresponding GMT time.
+ Regex r1("(Sat, 01 Jan 2000 ..:00:00 GMT|Fri, 31 Dec 1999 ..:00:00 GMT)");
+ CPPUNIT_ASSERT(re_match(r1, rfc822_date(t)));
}
void last_modified_time_test()
{
- time_t t = time(0);
- CPPUNIT_ASSERT(last_modified_time("no-such-file") == t);
- struct stat st;
- stat("test_config.h", &st);
- CPPUNIT_ASSERT(last_modified_time("test_config.h") == st.st_mtime);
- stat("/etc/passwd", &st);
- CPPUNIT_ASSERT(last_modified_time("/etc/passwd") == st.st_mtime);
+ time_t t = time(0);
+ CPPUNIT_ASSERT(last_modified_time("no-such-file") == t);
+ struct stat st;
+ stat("test_config.h", &st);
+ CPPUNIT_ASSERT(last_modified_time("test_config.h") == st.st_mtime);
+ stat("/etc/passwd", &st);
+ CPPUNIT_ASSERT(last_modified_time("/etc/passwd") == st.st_mtime);
}
void get_next_mime_header_test()
{
- string test_file = (string) TEST_SRC_DIR
- + "/cgi-util-tests/multipart_mime_header1.txt";
- FILE *in = fopen(test_file.c_str(), "r");
- if (!in)
- CPPUNIT_FAIL("Could not open the mime header file.");
-
- try {
- CPPUNIT_ASSERT(get_next_mime_header(in) == "--my_boundary");
- CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Type: Text/xml; charset=iso-8859-1");
- CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Description: dods-ddx");
- CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Id: <1234 at opendap.org>");
- }
- catch (Error &e) {
- CPPUNIT_FAIL(e.get_error_message());
- }
-
- fclose(in);
+ string test_file = (string) TEST_SRC_DIR + "/cgi-util-tests/multipart_mime_header1.txt";
+ FILE *in = fopen(test_file.c_str(), "r");
+ if (!in) CPPUNIT_FAIL("Could not open the mime header file.");
+
+ try {
+ CPPUNIT_ASSERT(get_next_mime_header(in) == "--my_boundary");
+ CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Type: Text/xml; charset=iso-8859-1");
+ CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Description: dods-ddx");
+ CPPUNIT_ASSERT(get_next_mime_header(in) == "Content-Id: <1234 at opendap.org>");
+ }
+ catch (Error &e) {
+ CPPUNIT_FAIL(e.get_error_message());
+ }
+
+ fclose(in);
}
void read_multipart_headers_test()
{
- string test_file = (string) TEST_SRC_DIR
- + "/cgi-util-tests/multipart_mime_header1.txt";
- FILE *in = fopen(test_file.c_str(), "r");
- if (!in)
- CPPUNIT_FAIL("Could not open the mime header file.");
-
- try {
- read_multipart_headers(in, "text/xml", dods_ddx);
- CPPUNIT_ASSERT(true);
- }
- catch (Error &e) {
- CPPUNIT_FAIL(e.get_error_message());
- }
-
- fclose(in);
+ string test_file = (string) TEST_SRC_DIR + "/cgi-util-tests/multipart_mime_header1.txt";
+ FILE *in = fopen(test_file.c_str(), "r");
+ if (!in) CPPUNIT_FAIL("Could not open the mime header file.");
+
+ try {
+ read_multipart_headers(in, "text/xml", dods_ddx);
+ CPPUNIT_ASSERT(true);
+ }
+ catch (Error &e) {
+ CPPUNIT_FAIL(e.get_error_message());
+ }
+
+ fclose(in);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(cgiUtilTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (cgiUtilTest);
-int main(int, char**)
+int main(int argc, char*argv[])
{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: cgiUtilTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = cgiUtilTest::suite()->getTests();
+ unsigned int prefix_len = cgiUtilTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- bool wasSuccessful = runner.run("", false);
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = cgiUtilTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/Makefile.am b/unit-tests/Makefile.am
index 974bc3e..084e060 100644
--- a/unit-tests/Makefile.am
+++ b/unit-tests/Makefile.am
@@ -75,7 +75,7 @@ if DAP4_DEFINED
UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \
chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \
- D4SequenceTest
+ D4SequenceTest DmrRoundTripTest DmrToDap2Test
endif
else
@@ -219,6 +219,12 @@ D4AsyncDocTest_LDADD = ../libdap.la $(AM_LDADD)
DMRTest_SOURCES = DMRTest.cc $(TEST_SRC)
DMRTest_LDADD = ../libdap.la $(AM_LDADD)
+DmrRoundTripTest_SOURCES = DmrRoundTripTest.cc $(TEST_SRC)
+DmrRoundTripTest_LDADD = ../libdap.la $(AM_LDADD)
+
+DmrToDap2Test_SOURCES = DmrToDap2Test.cc $(TEST_SRC)
+DmrToDap2Test_LDADD = ../libdap.la $(AM_LDADD)
+
D4FilterClauseTest_SOURCES = D4FilterClauseTest.cc
D4FilterClauseTest_LDADD = ../libdap.la $(AM_LDADD)
diff --git a/unit-tests/Makefile.in b/unit-tests/Makefile.in
index 1312004..76374ab 100644
--- a/unit-tests/Makefile.in
+++ b/unit-tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -46,11 +90,12 @@ TESTS = $(am__EXEEXT_2)
@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE at am__append_5 = D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \
@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \
- at CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ D4SequenceTest
+ at CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ D4SequenceTest DmrRoundTripTest DmrToDap2Test
subdir = unit-tests
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/conf/depcomp $(noinst_HEADERS) \
+ $(top_srcdir)/conf/test-driver
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
$(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -117,7 +162,9 @@ CONFIG_CLEAN_VPATH_FILES =
@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ D4AsyncDocTest$(EXEEXT) \
@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ DMRTest$(EXEEXT) \
@CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ D4FilterClauseTest$(EXEEXT) \
- at CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ D4SequenceTest$(EXEEXT)
+ at CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ D4SequenceTest$(EXEEXT) \
+ at CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ DmrRoundTripTest$(EXEEXT) \
+ at CPPUNIT_TRUE@@DAP4_DEFINED_TRUE@ DmrToDap2Test$(EXEEXT)
@CPPUNIT_TRUE at am__EXEEXT_2 = marshT$(EXEEXT) arrayT$(EXEEXT) \
@CPPUNIT_TRUE@ attrTableT$(EXEEXT) structT$(EXEEXT) \
@CPPUNIT_TRUE@ sequenceT$(EXEEXT) ddsT$(EXEEXT) dasT$(EXEEXT) \
@@ -138,6 +185,10 @@ am__DEPENDENCIES_1 =
@CPPUNIT_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
ArrayTest_DEPENDENCIES = ../libdap.la $(am__DEPENDENCIES_3)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
am__objects_1 = testFile.$(OBJEXT)
am_AttrTableTest_OBJECTS = AttrTableTest.$(OBJEXT) $(am__objects_1)
AttrTableTest_OBJECTS = $(am_AttrTableTest_OBJECTS)
@@ -233,6 +284,20 @@ am__DMRTest_SOURCES_DIST = DMRTest.cc testFile.cc testFile.h
DMRTest_OBJECTS = $(am_DMRTest_OBJECTS)
@DAP4_DEFINED_TRUE at DMRTest_DEPENDENCIES = ../libdap.la \
@DAP4_DEFINED_TRUE@ $(am__DEPENDENCIES_3)
+am__DmrRoundTripTest_SOURCES_DIST = DmrRoundTripTest.cc testFile.cc \
+ testFile.h
+ at DAP4_DEFINED_TRUE@am_DmrRoundTripTest_OBJECTS = \
+ at DAP4_DEFINED_TRUE@ DmrRoundTripTest.$(OBJEXT) $(am__objects_1)
+DmrRoundTripTest_OBJECTS = $(am_DmrRoundTripTest_OBJECTS)
+ at DAP4_DEFINED_TRUE@DmrRoundTripTest_DEPENDENCIES = ../libdap.la \
+ at DAP4_DEFINED_TRUE@ $(am__DEPENDENCIES_3)
+am__DmrToDap2Test_SOURCES_DIST = DmrToDap2Test.cc testFile.cc \
+ testFile.h
+ at DAP4_DEFINED_TRUE@am_DmrToDap2Test_OBJECTS = DmrToDap2Test.$(OBJEXT) \
+ at DAP4_DEFINED_TRUE@ $(am__objects_1)
+DmrToDap2Test_OBJECTS = $(am_DmrToDap2Test_OBJECTS)
+ at DAP4_DEFINED_TRUE@DmrToDap2Test_DEPENDENCIES = ../libdap.la \
+ at DAP4_DEFINED_TRUE@ $(am__DEPENDENCIES_3)
am_HTTPCacheTest_OBJECTS = HTTPCacheTest-HTTPCacheTest.$(OBJEXT)
HTTPCacheTest_OBJECTS = $(am_HTTPCacheTest_OBJECTS)
HTTPCacheTest_DEPENDENCIES = ../libdapclient.la ../libdap.la \
@@ -315,28 +380,58 @@ am_structT_OBJECTS = structT.$(OBJEXT)
structT_OBJECTS = $(am_structT_OBJECTS)
structT_DEPENDENCIES = ../tests/libtest-types.a ../libdap.la \
$(am__DEPENDENCIES_3)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conf/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(ArrayTest_SOURCES) $(AttrTableTest_SOURCES) \
$(ByteTest_SOURCES) $(D4AsyncDocTest_SOURCES) \
$(D4AttributesTest_SOURCES) $(D4DimensionsTest_SOURCES) \
@@ -345,7 +440,8 @@ SOURCES = $(ArrayTest_SOURCES) $(AttrTableTest_SOURCES) \
$(D4MarshallerTest_SOURCES) $(D4ParserSax2Test_SOURCES) \
$(D4SequenceTest_SOURCES) $(D4UnMarshallerTest_SOURCES) \
$(DASTest_SOURCES) $(DDSTest_SOURCES) $(DDXParserTest_SOURCES) \
- $(DMRTest_SOURCES) $(HTTPCacheTest_SOURCES) \
+ $(DMRTest_SOURCES) $(DmrRoundTripTest_SOURCES) \
+ $(DmrToDap2Test_SOURCES) $(HTTPCacheTest_SOURCES) \
$(HTTPConnectTest_SOURCES) $(MIMEUtilTest_SOURCES) \
$(MarshallerTest_SOURCES) $(RCReaderTest_SOURCES) \
$(RegexTest_SOURCES) $(SequenceTest_SOURCES) \
@@ -368,7 +464,9 @@ DIST_SOURCES = $(ArrayTest_SOURCES) $(AttrTableTest_SOURCES) \
$(am__D4SequenceTest_SOURCES_DIST) \
$(am__D4UnMarshallerTest_SOURCES_DIST) $(DASTest_SOURCES) \
$(DDSTest_SOURCES) $(DDXParserTest_SOURCES) \
- $(am__DMRTest_SOURCES_DIST) $(HTTPCacheTest_SOURCES) \
+ $(am__DMRTest_SOURCES_DIST) \
+ $(am__DmrRoundTripTest_SOURCES_DIST) \
+ $(am__DmrToDap2Test_SOURCES_DIST) $(HTTPCacheTest_SOURCES) \
$(HTTPConnectTest_SOURCES) $(MIMEUtilTest_SOURCES) \
$(MarshallerTest_SOURCES) $(RCReaderTest_SOURCES) \
$(RegexTest_SOURCES) $(SequenceTest_SOURCES) \
@@ -379,23 +477,250 @@ DIST_SOURCES = $(ArrayTest_SOURCES) $(AttrTableTest_SOURCES) \
$(ddsT_SOURCES) $(generalUtilTest_SOURCES) $(marshT_SOURCES) \
$(parserUtilTest_SOURCES) $(sequenceT_SOURCES) \
$(structT_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
HEADERS = $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ check recheck distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__recheck_rx = ^[ ]*:recheck:[ ]*
+am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
+am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+ recheck = 1; \
+ while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+ { \
+ if (rc < 0) \
+ { \
+ if ((getline line2 < ($$0 ".log")) < 0) \
+ recheck = 0; \
+ break; \
+ } \
+ else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+ { \
+ recheck = 0; \
+ break; \
+ } \
+ else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+ { \
+ break; \
+ } \
+ }; \
+ if (recheck) \
+ print $$0; \
+ close ($$0 ".trs"); \
+ close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+ print "fatal: making $@: " msg | "cat >&2"; \
+ exit 1; \
+} \
+function rst_section(header) \
+{ \
+ print header; \
+ len = length(header); \
+ for (i = 1; i <= len; i = i + 1) \
+ printf "="; \
+ printf "\n\n"; \
+} \
+{ \
+ copy_in_global_log = 1; \
+ global_test_result = "RUN"; \
+ while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+ { \
+ if (rc < 0) \
+ fatal("failed to read from " $$0 ".trs"); \
+ if (line ~ /$(am__global_test_result_rx)/) \
+ { \
+ sub("$(am__global_test_result_rx)", "", line); \
+ sub("[ ]*$$", "", line); \
+ global_test_result = line; \
+ } \
+ else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+ copy_in_global_log = 0; \
+ }; \
+ if (copy_in_global_log) \
+ { \
+ rst_section(global_test_result ": " $$0); \
+ while ((rc = (getline line < ($$0 ".log"))) != 0) \
+ { \
+ if (rc < 0) \
+ fatal("failed to read from " $$0 ".log"); \
+ print line; \
+ }; \
+ printf "\n"; \
+ }; \
+ close ($$0 ".trs"); \
+ close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+ --color-tests "$$am__color_tests" \
+ --enable-hard-errors "$$am__enable_hard_errors" \
+ --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test. Creates the
+# directory for the log if needed. Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log. Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup); \
+$(am__vpath_adj_setup) $(am__vpath_adj) \
+$(am__tty_colors); \
+srcdir=$(srcdir); export srcdir; \
+case "$@" in \
+ */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
+ *) am__odir=.;; \
+esac; \
+test "x$$am__odir" = x"." || test -d "$$am__odir" \
+ || $(MKDIR_P) "$$am__odir" || exit $$?; \
+if test -f "./$$f"; then dir=./; \
+elif test -f "$$f"; then dir=; \
+else dir="$(srcdir)/"; fi; \
+tst=$$dir$$f; log='$@'; \
+if test -n '$(DISABLE_HARD_ERRORS)'; then \
+ am__enable_hard_errors=no; \
+else \
+ am__enable_hard_errors=yes; \
+fi; \
+case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
+ am__expect_failure=yes;; \
+ *) \
+ am__expect_failure=no;; \
+esac; \
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed). The result is saved in the shell variable
+# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/conf/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+ case '$@' in \
+ */*) \
+ case '$*' in \
+ */*) b='$*';; \
+ *) b=`echo '$@' | sed 's/\.log$$//'`; \
+ esac;; \
+ *) \
+ b='$*';; \
+ esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT at .log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/conf/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+ $(TEST_LOG_FLAGS)
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
@@ -428,6 +753,7 @@ ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
@@ -467,6 +793,7 @@ DAPLIB_REVISION = @DAPLIB_REVISION@
DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DVR = @DVR@
@@ -782,6 +1109,7 @@ LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
@@ -815,6 +1143,7 @@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
@@ -919,6 +1248,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -961,7 +1291,6 @@ libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -1107,6 +1436,10 @@ ServerFunctionsListUnitTest_LDADD = ../libdap.la $(AM_LDADD)
@DAP4_DEFINED_TRUE at D4AsyncDocTest_LDADD = ../libdap.la $(AM_LDADD)
@DAP4_DEFINED_TRUE at DMRTest_SOURCES = DMRTest.cc $(TEST_SRC)
@DAP4_DEFINED_TRUE at DMRTest_LDADD = ../libdap.la $(AM_LDADD)
+ at DAP4_DEFINED_TRUE@DmrRoundTripTest_SOURCES = DmrRoundTripTest.cc $(TEST_SRC)
+ at DAP4_DEFINED_TRUE@DmrRoundTripTest_LDADD = ../libdap.la $(AM_LDADD)
+ at DAP4_DEFINED_TRUE@DmrToDap2Test_SOURCES = DmrToDap2Test.cc $(TEST_SRC)
+ at DAP4_DEFINED_TRUE@DmrToDap2Test_LDADD = ../libdap.la $(AM_LDADD)
@DAP4_DEFINED_TRUE at D4FilterClauseTest_SOURCES = D4FilterClauseTest.cc
@DAP4_DEFINED_TRUE at D4FilterClauseTest_LDADD = ../libdap.la $(AM_LDADD)
@DAP4_DEFINED_TRUE at D4SequenceTest_SOURCES = D4SequenceTest.cc $(TEST_SRC)
@@ -1114,7 +1447,7 @@ ServerFunctionsListUnitTest_LDADD = ../libdap.la $(AM_LDADD)
all: all-recursive
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -1154,120 +1487,166 @@ clean-checkPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-ArrayTest$(EXEEXT): $(ArrayTest_OBJECTS) $(ArrayTest_DEPENDENCIES)
+
+ArrayTest$(EXEEXT): $(ArrayTest_OBJECTS) $(ArrayTest_DEPENDENCIES) $(EXTRA_ArrayTest_DEPENDENCIES)
@rm -f ArrayTest$(EXEEXT)
- $(CXXLINK) $(ArrayTest_OBJECTS) $(ArrayTest_LDADD) $(LIBS)
-AttrTableTest$(EXEEXT): $(AttrTableTest_OBJECTS) $(AttrTableTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(ArrayTest_OBJECTS) $(ArrayTest_LDADD) $(LIBS)
+
+AttrTableTest$(EXEEXT): $(AttrTableTest_OBJECTS) $(AttrTableTest_DEPENDENCIES) $(EXTRA_AttrTableTest_DEPENDENCIES)
@rm -f AttrTableTest$(EXEEXT)
- $(CXXLINK) $(AttrTableTest_OBJECTS) $(AttrTableTest_LDADD) $(LIBS)
-ByteTest$(EXEEXT): $(ByteTest_OBJECTS) $(ByteTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(AttrTableTest_OBJECTS) $(AttrTableTest_LDADD) $(LIBS)
+
+ByteTest$(EXEEXT): $(ByteTest_OBJECTS) $(ByteTest_DEPENDENCIES) $(EXTRA_ByteTest_DEPENDENCIES)
@rm -f ByteTest$(EXEEXT)
- $(CXXLINK) $(ByteTest_OBJECTS) $(ByteTest_LDADD) $(LIBS)
-D4AsyncDocTest$(EXEEXT): $(D4AsyncDocTest_OBJECTS) $(D4AsyncDocTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(ByteTest_OBJECTS) $(ByteTest_LDADD) $(LIBS)
+
+D4AsyncDocTest$(EXEEXT): $(D4AsyncDocTest_OBJECTS) $(D4AsyncDocTest_DEPENDENCIES) $(EXTRA_D4AsyncDocTest_DEPENDENCIES)
@rm -f D4AsyncDocTest$(EXEEXT)
- $(CXXLINK) $(D4AsyncDocTest_OBJECTS) $(D4AsyncDocTest_LDADD) $(LIBS)
-D4AttributesTest$(EXEEXT): $(D4AttributesTest_OBJECTS) $(D4AttributesTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4AsyncDocTest_OBJECTS) $(D4AsyncDocTest_LDADD) $(LIBS)
+
+D4AttributesTest$(EXEEXT): $(D4AttributesTest_OBJECTS) $(D4AttributesTest_DEPENDENCIES) $(EXTRA_D4AttributesTest_DEPENDENCIES)
@rm -f D4AttributesTest$(EXEEXT)
- $(CXXLINK) $(D4AttributesTest_OBJECTS) $(D4AttributesTest_LDADD) $(LIBS)
-D4DimensionsTest$(EXEEXT): $(D4DimensionsTest_OBJECTS) $(D4DimensionsTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4AttributesTest_OBJECTS) $(D4AttributesTest_LDADD) $(LIBS)
+
+D4DimensionsTest$(EXEEXT): $(D4DimensionsTest_OBJECTS) $(D4DimensionsTest_DEPENDENCIES) $(EXTRA_D4DimensionsTest_DEPENDENCIES)
@rm -f D4DimensionsTest$(EXEEXT)
- $(CXXLINK) $(D4DimensionsTest_OBJECTS) $(D4DimensionsTest_LDADD) $(LIBS)
-D4EnumDefsTest$(EXEEXT): $(D4EnumDefsTest_OBJECTS) $(D4EnumDefsTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4DimensionsTest_OBJECTS) $(D4DimensionsTest_LDADD) $(LIBS)
+
+D4EnumDefsTest$(EXEEXT): $(D4EnumDefsTest_OBJECTS) $(D4EnumDefsTest_DEPENDENCIES) $(EXTRA_D4EnumDefsTest_DEPENDENCIES)
@rm -f D4EnumDefsTest$(EXEEXT)
- $(CXXLINK) $(D4EnumDefsTest_OBJECTS) $(D4EnumDefsTest_LDADD) $(LIBS)
-D4EnumTest$(EXEEXT): $(D4EnumTest_OBJECTS) $(D4EnumTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4EnumDefsTest_OBJECTS) $(D4EnumDefsTest_LDADD) $(LIBS)
+
+D4EnumTest$(EXEEXT): $(D4EnumTest_OBJECTS) $(D4EnumTest_DEPENDENCIES) $(EXTRA_D4EnumTest_DEPENDENCIES)
@rm -f D4EnumTest$(EXEEXT)
- $(CXXLINK) $(D4EnumTest_OBJECTS) $(D4EnumTest_LDADD) $(LIBS)
-D4FilterClauseTest$(EXEEXT): $(D4FilterClauseTest_OBJECTS) $(D4FilterClauseTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4EnumTest_OBJECTS) $(D4EnumTest_LDADD) $(LIBS)
+
+D4FilterClauseTest$(EXEEXT): $(D4FilterClauseTest_OBJECTS) $(D4FilterClauseTest_DEPENDENCIES) $(EXTRA_D4FilterClauseTest_DEPENDENCIES)
@rm -f D4FilterClauseTest$(EXEEXT)
- $(CXXLINK) $(D4FilterClauseTest_OBJECTS) $(D4FilterClauseTest_LDADD) $(LIBS)
-D4GroupTest$(EXEEXT): $(D4GroupTest_OBJECTS) $(D4GroupTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4FilterClauseTest_OBJECTS) $(D4FilterClauseTest_LDADD) $(LIBS)
+
+D4GroupTest$(EXEEXT): $(D4GroupTest_OBJECTS) $(D4GroupTest_DEPENDENCIES) $(EXTRA_D4GroupTest_DEPENDENCIES)
@rm -f D4GroupTest$(EXEEXT)
- $(CXXLINK) $(D4GroupTest_OBJECTS) $(D4GroupTest_LDADD) $(LIBS)
-D4MarshallerTest$(EXEEXT): $(D4MarshallerTest_OBJECTS) $(D4MarshallerTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4GroupTest_OBJECTS) $(D4GroupTest_LDADD) $(LIBS)
+
+D4MarshallerTest$(EXEEXT): $(D4MarshallerTest_OBJECTS) $(D4MarshallerTest_DEPENDENCIES) $(EXTRA_D4MarshallerTest_DEPENDENCIES)
@rm -f D4MarshallerTest$(EXEEXT)
- $(CXXLINK) $(D4MarshallerTest_OBJECTS) $(D4MarshallerTest_LDADD) $(LIBS)
-D4ParserSax2Test$(EXEEXT): $(D4ParserSax2Test_OBJECTS) $(D4ParserSax2Test_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4MarshallerTest_OBJECTS) $(D4MarshallerTest_LDADD) $(LIBS)
+
+D4ParserSax2Test$(EXEEXT): $(D4ParserSax2Test_OBJECTS) $(D4ParserSax2Test_DEPENDENCIES) $(EXTRA_D4ParserSax2Test_DEPENDENCIES)
@rm -f D4ParserSax2Test$(EXEEXT)
- $(CXXLINK) $(D4ParserSax2Test_OBJECTS) $(D4ParserSax2Test_LDADD) $(LIBS)
-D4SequenceTest$(EXEEXT): $(D4SequenceTest_OBJECTS) $(D4SequenceTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4ParserSax2Test_OBJECTS) $(D4ParserSax2Test_LDADD) $(LIBS)
+
+D4SequenceTest$(EXEEXT): $(D4SequenceTest_OBJECTS) $(D4SequenceTest_DEPENDENCIES) $(EXTRA_D4SequenceTest_DEPENDENCIES)
@rm -f D4SequenceTest$(EXEEXT)
- $(CXXLINK) $(D4SequenceTest_OBJECTS) $(D4SequenceTest_LDADD) $(LIBS)
-D4UnMarshallerTest$(EXEEXT): $(D4UnMarshallerTest_OBJECTS) $(D4UnMarshallerTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4SequenceTest_OBJECTS) $(D4SequenceTest_LDADD) $(LIBS)
+
+D4UnMarshallerTest$(EXEEXT): $(D4UnMarshallerTest_OBJECTS) $(D4UnMarshallerTest_DEPENDENCIES) $(EXTRA_D4UnMarshallerTest_DEPENDENCIES)
@rm -f D4UnMarshallerTest$(EXEEXT)
- $(CXXLINK) $(D4UnMarshallerTest_OBJECTS) $(D4UnMarshallerTest_LDADD) $(LIBS)
-DASTest$(EXEEXT): $(DASTest_OBJECTS) $(DASTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(D4UnMarshallerTest_OBJECTS) $(D4UnMarshallerTest_LDADD) $(LIBS)
+
+DASTest$(EXEEXT): $(DASTest_OBJECTS) $(DASTest_DEPENDENCIES) $(EXTRA_DASTest_DEPENDENCIES)
@rm -f DASTest$(EXEEXT)
- $(CXXLINK) $(DASTest_OBJECTS) $(DASTest_LDADD) $(LIBS)
-DDSTest$(EXEEXT): $(DDSTest_OBJECTS) $(DDSTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(DASTest_OBJECTS) $(DASTest_LDADD) $(LIBS)
+
+DDSTest$(EXEEXT): $(DDSTest_OBJECTS) $(DDSTest_DEPENDENCIES) $(EXTRA_DDSTest_DEPENDENCIES)
@rm -f DDSTest$(EXEEXT)
- $(CXXLINK) $(DDSTest_OBJECTS) $(DDSTest_LDADD) $(LIBS)
-DDXParserTest$(EXEEXT): $(DDXParserTest_OBJECTS) $(DDXParserTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(DDSTest_OBJECTS) $(DDSTest_LDADD) $(LIBS)
+
+DDXParserTest$(EXEEXT): $(DDXParserTest_OBJECTS) $(DDXParserTest_DEPENDENCIES) $(EXTRA_DDXParserTest_DEPENDENCIES)
@rm -f DDXParserTest$(EXEEXT)
- $(CXXLINK) $(DDXParserTest_OBJECTS) $(DDXParserTest_LDADD) $(LIBS)
-DMRTest$(EXEEXT): $(DMRTest_OBJECTS) $(DMRTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(DDXParserTest_OBJECTS) $(DDXParserTest_LDADD) $(LIBS)
+
+DMRTest$(EXEEXT): $(DMRTest_OBJECTS) $(DMRTest_DEPENDENCIES) $(EXTRA_DMRTest_DEPENDENCIES)
@rm -f DMRTest$(EXEEXT)
- $(CXXLINK) $(DMRTest_OBJECTS) $(DMRTest_LDADD) $(LIBS)
-HTTPCacheTest$(EXEEXT): $(HTTPCacheTest_OBJECTS) $(HTTPCacheTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(DMRTest_OBJECTS) $(DMRTest_LDADD) $(LIBS)
+
+DmrRoundTripTest$(EXEEXT): $(DmrRoundTripTest_OBJECTS) $(DmrRoundTripTest_DEPENDENCIES) $(EXTRA_DmrRoundTripTest_DEPENDENCIES)
+ @rm -f DmrRoundTripTest$(EXEEXT)
+ $(AM_V_CXXLD)$(CXXLINK) $(DmrRoundTripTest_OBJECTS) $(DmrRoundTripTest_LDADD) $(LIBS)
+
+DmrToDap2Test$(EXEEXT): $(DmrToDap2Test_OBJECTS) $(DmrToDap2Test_DEPENDENCIES) $(EXTRA_DmrToDap2Test_DEPENDENCIES)
+ @rm -f DmrToDap2Test$(EXEEXT)
+ $(AM_V_CXXLD)$(CXXLINK) $(DmrToDap2Test_OBJECTS) $(DmrToDap2Test_LDADD) $(LIBS)
+
+HTTPCacheTest$(EXEEXT): $(HTTPCacheTest_OBJECTS) $(HTTPCacheTest_DEPENDENCIES) $(EXTRA_HTTPCacheTest_DEPENDENCIES)
@rm -f HTTPCacheTest$(EXEEXT)
- $(CXXLINK) $(HTTPCacheTest_OBJECTS) $(HTTPCacheTest_LDADD) $(LIBS)
-HTTPConnectTest$(EXEEXT): $(HTTPConnectTest_OBJECTS) $(HTTPConnectTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(HTTPCacheTest_OBJECTS) $(HTTPCacheTest_LDADD) $(LIBS)
+
+HTTPConnectTest$(EXEEXT): $(HTTPConnectTest_OBJECTS) $(HTTPConnectTest_DEPENDENCIES) $(EXTRA_HTTPConnectTest_DEPENDENCIES)
@rm -f HTTPConnectTest$(EXEEXT)
- $(CXXLINK) $(HTTPConnectTest_OBJECTS) $(HTTPConnectTest_LDADD) $(LIBS)
-MIMEUtilTest$(EXEEXT): $(MIMEUtilTest_OBJECTS) $(MIMEUtilTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(HTTPConnectTest_OBJECTS) $(HTTPConnectTest_LDADD) $(LIBS)
+
+MIMEUtilTest$(EXEEXT): $(MIMEUtilTest_OBJECTS) $(MIMEUtilTest_DEPENDENCIES) $(EXTRA_MIMEUtilTest_DEPENDENCIES)
@rm -f MIMEUtilTest$(EXEEXT)
- $(CXXLINK) $(MIMEUtilTest_OBJECTS) $(MIMEUtilTest_LDADD) $(LIBS)
-MarshallerTest$(EXEEXT): $(MarshallerTest_OBJECTS) $(MarshallerTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(MIMEUtilTest_OBJECTS) $(MIMEUtilTest_LDADD) $(LIBS)
+
+MarshallerTest$(EXEEXT): $(MarshallerTest_OBJECTS) $(MarshallerTest_DEPENDENCIES) $(EXTRA_MarshallerTest_DEPENDENCIES)
@rm -f MarshallerTest$(EXEEXT)
- $(CXXLINK) $(MarshallerTest_OBJECTS) $(MarshallerTest_LDADD) $(LIBS)
-RCReaderTest$(EXEEXT): $(RCReaderTest_OBJECTS) $(RCReaderTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(MarshallerTest_OBJECTS) $(MarshallerTest_LDADD) $(LIBS)
+
+RCReaderTest$(EXEEXT): $(RCReaderTest_OBJECTS) $(RCReaderTest_DEPENDENCIES) $(EXTRA_RCReaderTest_DEPENDENCIES)
@rm -f RCReaderTest$(EXEEXT)
- $(CXXLINK) $(RCReaderTest_OBJECTS) $(RCReaderTest_LDADD) $(LIBS)
-RegexTest$(EXEEXT): $(RegexTest_OBJECTS) $(RegexTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(RCReaderTest_OBJECTS) $(RCReaderTest_LDADD) $(LIBS)
+
+RegexTest$(EXEEXT): $(RegexTest_OBJECTS) $(RegexTest_DEPENDENCIES) $(EXTRA_RegexTest_DEPENDENCIES)
@rm -f RegexTest$(EXEEXT)
- $(CXXLINK) $(RegexTest_OBJECTS) $(RegexTest_LDADD) $(LIBS)
-SequenceTest$(EXEEXT): $(SequenceTest_OBJECTS) $(SequenceTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(RegexTest_OBJECTS) $(RegexTest_LDADD) $(LIBS)
+
+SequenceTest$(EXEEXT): $(SequenceTest_OBJECTS) $(SequenceTest_DEPENDENCIES) $(EXTRA_SequenceTest_DEPENDENCIES)
@rm -f SequenceTest$(EXEEXT)
- $(CXXLINK) $(SequenceTest_OBJECTS) $(SequenceTest_LDADD) $(LIBS)
-ServerFunctionsListUnitTest$(EXEEXT): $(ServerFunctionsListUnitTest_OBJECTS) $(ServerFunctionsListUnitTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(SequenceTest_OBJECTS) $(SequenceTest_LDADD) $(LIBS)
+
+ServerFunctionsListUnitTest$(EXEEXT): $(ServerFunctionsListUnitTest_OBJECTS) $(ServerFunctionsListUnitTest_DEPENDENCIES) $(EXTRA_ServerFunctionsListUnitTest_DEPENDENCIES)
@rm -f ServerFunctionsListUnitTest$(EXEEXT)
- $(CXXLINK) $(ServerFunctionsListUnitTest_OBJECTS) $(ServerFunctionsListUnitTest_LDADD) $(LIBS)
-SignalHandlerTest$(EXEEXT): $(SignalHandlerTest_OBJECTS) $(SignalHandlerTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(ServerFunctionsListUnitTest_OBJECTS) $(ServerFunctionsListUnitTest_LDADD) $(LIBS)
+
+SignalHandlerTest$(EXEEXT): $(SignalHandlerTest_OBJECTS) $(SignalHandlerTest_DEPENDENCIES) $(EXTRA_SignalHandlerTest_DEPENDENCIES)
@rm -f SignalHandlerTest$(EXEEXT)
- $(CXXLINK) $(SignalHandlerTest_OBJECTS) $(SignalHandlerTest_LDADD) $(LIBS)
-ancT$(EXEEXT): $(ancT_OBJECTS) $(ancT_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(SignalHandlerTest_OBJECTS) $(SignalHandlerTest_LDADD) $(LIBS)
+
+ancT$(EXEEXT): $(ancT_OBJECTS) $(ancT_DEPENDENCIES) $(EXTRA_ancT_DEPENDENCIES)
@rm -f ancT$(EXEEXT)
- $(CXXLINK) $(ancT_OBJECTS) $(ancT_LDADD) $(LIBS)
-arrayT$(EXEEXT): $(arrayT_OBJECTS) $(arrayT_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(ancT_OBJECTS) $(ancT_LDADD) $(LIBS)
+
+arrayT$(EXEEXT): $(arrayT_OBJECTS) $(arrayT_DEPENDENCIES) $(EXTRA_arrayT_DEPENDENCIES)
@rm -f arrayT$(EXEEXT)
- $(CXXLINK) $(arrayT_OBJECTS) $(arrayT_LDADD) $(LIBS)
-attrTableT$(EXEEXT): $(attrTableT_OBJECTS) $(attrTableT_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(arrayT_OBJECTS) $(arrayT_LDADD) $(LIBS)
+
+attrTableT$(EXEEXT): $(attrTableT_OBJECTS) $(attrTableT_DEPENDENCIES) $(EXTRA_attrTableT_DEPENDENCIES)
@rm -f attrTableT$(EXEEXT)
- $(CXXLINK) $(attrTableT_OBJECTS) $(attrTableT_LDADD) $(LIBS)
-chunked_iostream_test$(EXEEXT): $(chunked_iostream_test_OBJECTS) $(chunked_iostream_test_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(attrTableT_OBJECTS) $(attrTableT_LDADD) $(LIBS)
+
+chunked_iostream_test$(EXEEXT): $(chunked_iostream_test_OBJECTS) $(chunked_iostream_test_DEPENDENCIES) $(EXTRA_chunked_iostream_test_DEPENDENCIES)
@rm -f chunked_iostream_test$(EXEEXT)
- $(CXXLINK) $(chunked_iostream_test_OBJECTS) $(chunked_iostream_test_LDADD) $(LIBS)
-dasT$(EXEEXT): $(dasT_OBJECTS) $(dasT_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(chunked_iostream_test_OBJECTS) $(chunked_iostream_test_LDADD) $(LIBS)
+
+dasT$(EXEEXT): $(dasT_OBJECTS) $(dasT_DEPENDENCIES) $(EXTRA_dasT_DEPENDENCIES)
@rm -f dasT$(EXEEXT)
- $(CXXLINK) $(dasT_OBJECTS) $(dasT_LDADD) $(LIBS)
-ddsT$(EXEEXT): $(ddsT_OBJECTS) $(ddsT_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(dasT_OBJECTS) $(dasT_LDADD) $(LIBS)
+
+ddsT$(EXEEXT): $(ddsT_OBJECTS) $(ddsT_DEPENDENCIES) $(EXTRA_ddsT_DEPENDENCIES)
@rm -f ddsT$(EXEEXT)
- $(CXXLINK) $(ddsT_OBJECTS) $(ddsT_LDADD) $(LIBS)
-generalUtilTest$(EXEEXT): $(generalUtilTest_OBJECTS) $(generalUtilTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(ddsT_OBJECTS) $(ddsT_LDADD) $(LIBS)
+
+generalUtilTest$(EXEEXT): $(generalUtilTest_OBJECTS) $(generalUtilTest_DEPENDENCIES) $(EXTRA_generalUtilTest_DEPENDENCIES)
@rm -f generalUtilTest$(EXEEXT)
- $(CXXLINK) $(generalUtilTest_OBJECTS) $(generalUtilTest_LDADD) $(LIBS)
-marshT$(EXEEXT): $(marshT_OBJECTS) $(marshT_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(generalUtilTest_OBJECTS) $(generalUtilTest_LDADD) $(LIBS)
+
+marshT$(EXEEXT): $(marshT_OBJECTS) $(marshT_DEPENDENCIES) $(EXTRA_marshT_DEPENDENCIES)
@rm -f marshT$(EXEEXT)
- $(CXXLINK) $(marshT_OBJECTS) $(marshT_LDADD) $(LIBS)
-parserUtilTest$(EXEEXT): $(parserUtilTest_OBJECTS) $(parserUtilTest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(marshT_OBJECTS) $(marshT_LDADD) $(LIBS)
+
+parserUtilTest$(EXEEXT): $(parserUtilTest_OBJECTS) $(parserUtilTest_DEPENDENCIES) $(EXTRA_parserUtilTest_DEPENDENCIES)
@rm -f parserUtilTest$(EXEEXT)
- $(CXXLINK) $(parserUtilTest_OBJECTS) $(parserUtilTest_LDADD) $(LIBS)
-sequenceT$(EXEEXT): $(sequenceT_OBJECTS) $(sequenceT_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(parserUtilTest_OBJECTS) $(parserUtilTest_LDADD) $(LIBS)
+
+sequenceT$(EXEEXT): $(sequenceT_OBJECTS) $(sequenceT_DEPENDENCIES) $(EXTRA_sequenceT_DEPENDENCIES)
@rm -f sequenceT$(EXEEXT)
- $(CXXLINK) $(sequenceT_OBJECTS) $(sequenceT_LDADD) $(LIBS)
-structT$(EXEEXT): $(structT_OBJECTS) $(structT_DEPENDENCIES)
+ $(AM_V_CXXLD)$(CXXLINK) $(sequenceT_OBJECTS) $(sequenceT_LDADD) $(LIBS)
+
+structT$(EXEEXT): $(structT_OBJECTS) $(structT_DEPENDENCIES) $(EXTRA_structT_DEPENDENCIES)
@rm -f structT$(EXEEXT)
- $(CXXLINK) $(structT_OBJECTS) $(structT_LDADD) $(LIBS)
+ $(AM_V_CXXLD)$(CXXLINK) $(structT_OBJECTS) $(structT_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -1293,6 +1672,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DDSTest.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DDXParserTest-DDXParserTest.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DMRTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DmrRoundTripTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DmrToDap2Test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MIMEUtilTest.Po at am__quote@
@@ -1316,67 +1697,67 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testFile.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.lo:
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
DDXParserTest-DDXParserTest.o: DDXParserTest.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DDXParserTest-DDXParserTest.o -MD -MP -MF $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo -c -o DDXParserTest-DDXParserTest.o `test -f 'DDXParserTest.cc' || echo '$(srcdir)/'`DDXParserTest.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo $(DEPDIR)/DDXParserTest-DDXParserTest.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DDXParserTest.cc' object='DDXParserTest-DDXParserTest.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DDXParserTest-DDXParserTest.o -MD -MP -MF $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo -c -o DDXParserTest-DDXParserTest.o `test -f 'DDXParserTest.cc' || echo '$(srcdir)/'`DDXParserTest.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo $(DEPDIR)/DDXParserTest-DDXParserTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DDXParserTest.cc' object='DDXParserTest-DDXParserTest.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DDXParserTest-DDXParserTest.o `test -f 'DDXParserTest.cc' || echo '$(srcdir)/'`DDXParserTest.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DDXParserTest-DDXParserTest.o `test -f 'DDXParserTest.cc' || echo '$(srcdir)/'`DDXParserTest.cc
DDXParserTest-DDXParserTest.obj: DDXParserTest.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DDXParserTest-DDXParserTest.obj -MD -MP -MF $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo -c -o DDXParserTest-DDXParserTest.obj `if test -f 'DDXParserTest.cc'; then $(CYGPATH_W) 'DDXParserTest.cc'; else $(CYGPATH_W) '$(srcdir)/DDXParserTest.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo $(DEPDIR)/DDXParserTest-DDXParserTest.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='DDXParserTest.cc' object='DDXParserTest-DDXParserTest.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DDXParserTest-DDXParserTest.obj -MD -MP -MF $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo -c -o DDXParserTest-DDXParserTest.obj `if test -f 'DDXParserTest.cc'; then $(CYGPATH_W) 'DDXParserTest.cc'; else $(CYGPATH_W) '$(srcdir)/DDXParserTest.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/DDXParserTest-DDXParserTest.Tpo $(DEPDIR)/DDXParserTest-DDXParserTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='DDXParserTest.cc' object='DDXParserTest-DDXParserTest.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DDXParserTest-DDXParserTest.obj `if test -f 'DDXParserTest.cc'; then $(CYGPATH_W) 'DDXParserTest.cc'; else $(CYGPATH_W) '$(srcdir)/DDXParserTest.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DDXParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DDXParserTest-DDXParserTest.obj `if test -f 'DDXParserTest.cc'; then $(CYGPATH_W) 'DDXParserTest.cc'; else $(CYGPATH_W) '$(srcdir)/DDXParserTest.cc'; fi`
HTTPCacheTest-HTTPCacheTest.o: HTTPCacheTest.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPCacheTest-HTTPCacheTest.o -MD -MP -MF $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo -c -o HTTPCacheTest-HTTPCacheTest.o `test -f 'HTTPCacheTest.cc' || echo '$(srcdir)/'`HTTPCacheTest.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='HTTPCacheTest.cc' object='HTTPCacheTest-HTTPCacheTest.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPCacheTest-HTTPCacheTest.o -MD -MP -MF $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo -c -o HTTPCacheTest-HTTPCacheTest.o `test -f 'HTTPCacheTest.cc' || echo '$(srcdir)/'`HTTPCacheTest.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HTTPCacheTest.cc' object='HTTPCacheTest-HTTPCacheTest.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPCacheTest-HTTPCacheTest.o `test -f 'HTTPCacheTest.cc' || echo '$(srcdir)/'`HTTPCacheTest.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPCacheTest-HTTPCacheTest.o `test -f 'HTTPCacheTest.cc' || echo '$(srcdir)/'`HTTPCacheTest.cc
HTTPCacheTest-HTTPCacheTest.obj: HTTPCacheTest.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPCacheTest-HTTPCacheTest.obj -MD -MP -MF $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo -c -o HTTPCacheTest-HTTPCacheTest.obj `if test -f 'HTTPCacheTest.cc'; then $(CYGPATH_W) 'HTTPCacheTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPCacheTest.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='HTTPCacheTest.cc' object='HTTPCacheTest-HTTPCacheTest.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPCacheTest-HTTPCacheTest.obj -MD -MP -MF $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo -c -o HTTPCacheTest-HTTPCacheTest.obj `if test -f 'HTTPCacheTest.cc'; then $(CYGPATH_W) 'HTTPCacheTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPCacheTest.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Tpo $(DEPDIR)/HTTPCacheTest-HTTPCacheTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HTTPCacheTest.cc' object='HTTPCacheTest-HTTPCacheTest.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPCacheTest-HTTPCacheTest.obj `if test -f 'HTTPCacheTest.cc'; then $(CYGPATH_W) 'HTTPCacheTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPCacheTest.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPCacheTest-HTTPCacheTest.obj `if test -f 'HTTPCacheTest.cc'; then $(CYGPATH_W) 'HTTPCacheTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPCacheTest.cc'; fi`
HTTPConnectTest-HTTPConnectTest.o: HTTPConnectTest.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPConnectTest-HTTPConnectTest.o -MD -MP -MF $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo -c -o HTTPConnectTest-HTTPConnectTest.o `test -f 'HTTPConnectTest.cc' || echo '$(srcdir)/'`HTTPConnectTest.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='HTTPConnectTest.cc' object='HTTPConnectTest-HTTPConnectTest.o' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPConnectTest-HTTPConnectTest.o -MD -MP -MF $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo -c -o HTTPConnectTest-HTTPConnectTest.o `test -f 'HTTPConnectTest.cc' || echo '$(srcdir)/'`HTTPConnectTest.cc
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HTTPConnectTest.cc' object='HTTPConnectTest-HTTPConnectTest.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPConnectTest-HTTPConnectTest.o `test -f 'HTTPConnectTest.cc' || echo '$(srcdir)/'`HTTPConnectTest.cc
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPConnectTest-HTTPConnectTest.o `test -f 'HTTPConnectTest.cc' || echo '$(srcdir)/'`HTTPConnectTest.cc
HTTPConnectTest-HTTPConnectTest.obj: HTTPConnectTest.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPConnectTest-HTTPConnectTest.obj -MD -MP -MF $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo -c -o HTTPConnectTest-HTTPConnectTest.obj `if test -f 'HTTPConnectTest.cc'; then $(CYGPATH_W) 'HTTPConnectTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPConnectTest.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='HTTPConnectTest.cc' object='HTTPConnectTest-HTTPConnectTest.obj' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT HTTPConnectTest-HTTPConnectTest.obj -MD -MP -MF $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo -c -o HTTPConnectTest-HTTPConnectTest.obj `if test -f 'HTTPConnectTest.cc'; then $(CYGPATH_W) 'HTTPConnectTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPConnectTest.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Tpo $(DEPDIR)/HTTPConnectTest-HTTPConnectTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HTTPConnectTest.cc' object='HTTPConnectTest-HTTPConnectTest.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPConnectTest-HTTPConnectTest.obj `if test -f 'HTTPConnectTest.cc'; then $(CYGPATH_W) 'HTTPConnectTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPConnectTest.cc'; fi`
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(HTTPConnectTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o HTTPConnectTest-HTTPConnectTest.obj `if test -f 'HTTPConnectTest.cc'; then $(CYGPATH_W) 'HTTPConnectTest.cc'; else $(CYGPATH_W) '$(srcdir)/HTTPConnectTest.cc'; fi`
mostlyclean-libtool:
-rm -f *.lo
@@ -1385,22 +1766,25 @@ clean-libtool:
-rm -rf .libs _libs
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -1415,57 +1799,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1481,12 +1820,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -1498,15 +1832,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -1515,101 +1845,460 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- $(am__tty_colors); \
- if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
- elif test -f $$tst; then dir=; \
- else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
- ;; \
- *) \
- col=$$grn; res=PASS; \
- ;; \
- esac; \
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
- fi; \
- echo "$${col}$$res$${std}: $$tst"; \
- done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+ rm -f $< $@
+ $(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+ @:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+ @$(am__set_TESTS_bases); \
+ am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+ redo_bases=`for i in $$bases; do \
+ am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+ done`; \
+ if test -n "$$redo_bases"; then \
+ redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+ redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+ if $(am__make_dryrun); then :; else \
+ rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
+ fi; \
+ if test -n "$$am__remaking_logs"; then \
+ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+ "recursion detected" >&2; \
+ else \
+ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+ fi; \
+ if $(am__make_dryrun); then :; else \
+ st=0; \
+ errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+ for i in $$redo_bases; do \
+ test -f $$i.trs && test -r $$i.trs \
+ || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+ test -f $$i.log && test -r $$i.log \
+ || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+ done; \
+ test $$st -eq 0 || exit 1; \
+ fi
+ @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+ ws='[ ]'; \
+ results=`for b in $$bases; do echo $$b.trs; done`; \
+ test -n "$$results" || results=/dev/null; \
+ all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
+ pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
+ fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
+ skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
+ xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+ xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+ error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+ if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+ success=true; \
+ else \
+ success=false; \
+ fi; \
+ br='==================='; br=$$br$$br$$br$$br; \
+ result_count () \
+ { \
+ if test x"$$1" = x"--maybe-color"; then \
+ maybe_colorize=yes; \
+ elif test x"$$1" = x"--no-color"; then \
+ maybe_colorize=no; \
else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ echo "$@: invalid 'result_count' usage" >&2; exit 4; \
fi; \
- else \
- if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
+ shift; \
+ desc=$$1 count=$$2; \
+ if test $$maybe_colorize = yes && test $$count -gt 0; then \
+ color_start=$$3 color_end=$$std; \
else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ color_start= color_end=; \
fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
- else \
- skipped="($$skip tests were not run)"; \
- fi; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
- report=""; \
- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- report="Please report to $(PACKAGE_BUGREPORT)"; \
- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
- else \
- echo "$$red$$dashes"; \
- fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
- else :; fi
+ echo "$${color_start}# $$desc $$count$${color_end}"; \
+ }; \
+ create_testsuite_report () \
+ { \
+ result_count $$1 "TOTAL:" $$all "$$brg"; \
+ result_count $$1 "PASS: " $$pass "$$grn"; \
+ result_count $$1 "SKIP: " $$skip "$$blu"; \
+ result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+ result_count $$1 "FAIL: " $$fail "$$red"; \
+ result_count $$1 "XPASS:" $$xpass "$$red"; \
+ result_count $$1 "ERROR:" $$error "$$mgn"; \
+ }; \
+ { \
+ echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
+ $(am__rst_title); \
+ create_testsuite_report --no-color; \
+ echo; \
+ echo ".. contents:: :depth: 2"; \
+ echo; \
+ for b in $$bases; do echo $$b; done \
+ | $(am__create_global_log); \
+ } >$(TEST_SUITE_LOG).tmp || exit 1; \
+ mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
+ if $$success; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+ echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+ if $$success; then :; else \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ if test -n "$(PACKAGE_BUGREPORT)"; then \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ fi; \
+ echo "$$col$$br$$std"; \
+ fi; \
+ $$success || exit 1
+
+check-TESTS:
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @set +e; $(am__set_TESTS_bases); \
+ log_list=`for i in $$bases; do echo $$i.log; done`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+ exit $$?;
+recheck: all $(check_PROGRAMS)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @set +e; $(am__set_TESTS_bases); \
+ bases=`for i in $$bases; do echo $$i; done \
+ | $(am__list_recheck_tests)` || exit 1; \
+ log_list=`for i in $$bases; do echo $$i.log; done`; \
+ log_list=`echo $$log_list`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+ am__force_recheck=am--force-recheck \
+ TEST_LOGS="$$log_list"; \
+ exit $$?
+marshT.log: marshT$(EXEEXT)
+ @p='marshT$(EXEEXT)'; \
+ b='marshT'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+arrayT.log: arrayT$(EXEEXT)
+ @p='arrayT$(EXEEXT)'; \
+ b='arrayT'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+attrTableT.log: attrTableT$(EXEEXT)
+ @p='attrTableT$(EXEEXT)'; \
+ b='attrTableT'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+structT.log: structT$(EXEEXT)
+ @p='structT$(EXEEXT)'; \
+ b='structT'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+sequenceT.log: sequenceT$(EXEEXT)
+ @p='sequenceT$(EXEEXT)'; \
+ b='sequenceT'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ddsT.log: ddsT$(EXEEXT)
+ @p='ddsT$(EXEEXT)'; \
+ b='ddsT'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+dasT.log: dasT$(EXEEXT)
+ @p='dasT$(EXEEXT)'; \
+ b='dasT'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+RegexTest.log: RegexTest$(EXEEXT)
+ @p='RegexTest$(EXEEXT)'; \
+ b='RegexTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ArrayTest.log: ArrayTest$(EXEEXT)
+ @p='ArrayTest$(EXEEXT)'; \
+ b='ArrayTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+AttrTableTest.log: AttrTableTest$(EXEEXT)
+ @p='AttrTableTest$(EXEEXT)'; \
+ b='AttrTableTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ByteTest.log: ByteTest$(EXEEXT)
+ @p='ByteTest$(EXEEXT)'; \
+ b='ByteTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+MIMEUtilTest.log: MIMEUtilTest$(EXEEXT)
+ @p='MIMEUtilTest$(EXEEXT)'; \
+ b='MIMEUtilTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ancT.log: ancT$(EXEEXT)
+ @p='ancT$(EXEEXT)'; \
+ b='ancT'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+DASTest.log: DASTest$(EXEEXT)
+ @p='DASTest$(EXEEXT)'; \
+ b='DASTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+DDSTest.log: DDSTest$(EXEEXT)
+ @p='DDSTest$(EXEEXT)'; \
+ b='DDSTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+DDXParserTest.log: DDXParserTest$(EXEEXT)
+ @p='DDXParserTest$(EXEEXT)'; \
+ b='DDXParserTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+generalUtilTest.log: generalUtilTest$(EXEEXT)
+ @p='generalUtilTest$(EXEEXT)'; \
+ b='generalUtilTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+HTTPConnectTest.log: HTTPConnectTest$(EXEEXT)
+ @p='HTTPConnectTest$(EXEEXT)'; \
+ b='HTTPConnectTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+parserUtilTest.log: parserUtilTest$(EXEEXT)
+ @p='parserUtilTest$(EXEEXT)'; \
+ b='parserUtilTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+RCReaderTest.log: RCReaderTest$(EXEEXT)
+ @p='RCReaderTest$(EXEEXT)'; \
+ b='RCReaderTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+SequenceTest.log: SequenceTest$(EXEEXT)
+ @p='SequenceTest$(EXEEXT)'; \
+ b='SequenceTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+SignalHandlerTest.log: SignalHandlerTest$(EXEEXT)
+ @p='SignalHandlerTest$(EXEEXT)'; \
+ b='SignalHandlerTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+MarshallerTest.log: MarshallerTest$(EXEEXT)
+ @p='MarshallerTest$(EXEEXT)'; \
+ b='MarshallerTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+HTTPCacheTest.log: HTTPCacheTest$(EXEEXT)
+ @p='HTTPCacheTest$(EXEEXT)'; \
+ b='HTTPCacheTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ServerFunctionsListUnitTest.log: ServerFunctionsListUnitTest$(EXEEXT)
+ @p='ServerFunctionsListUnitTest$(EXEEXT)'; \
+ b='ServerFunctionsListUnitTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4MarshallerTest.log: D4MarshallerTest$(EXEEXT)
+ @p='D4MarshallerTest$(EXEEXT)'; \
+ b='D4MarshallerTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4UnMarshallerTest.log: D4UnMarshallerTest$(EXEEXT)
+ @p='D4UnMarshallerTest$(EXEEXT)'; \
+ b='D4UnMarshallerTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4DimensionsTest.log: D4DimensionsTest$(EXEEXT)
+ @p='D4DimensionsTest$(EXEEXT)'; \
+ b='D4DimensionsTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4EnumDefsTest.log: D4EnumDefsTest$(EXEEXT)
+ @p='D4EnumDefsTest$(EXEEXT)'; \
+ b='D4EnumDefsTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4GroupTest.log: D4GroupTest$(EXEEXT)
+ @p='D4GroupTest$(EXEEXT)'; \
+ b='D4GroupTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4ParserSax2Test.log: D4ParserSax2Test$(EXEEXT)
+ @p='D4ParserSax2Test$(EXEEXT)'; \
+ b='D4ParserSax2Test'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4AttributesTest.log: D4AttributesTest$(EXEEXT)
+ @p='D4AttributesTest$(EXEEXT)'; \
+ b='D4AttributesTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4EnumTest.log: D4EnumTest$(EXEEXT)
+ @p='D4EnumTest$(EXEEXT)'; \
+ b='D4EnumTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+chunked_iostream_test.log: chunked_iostream_test$(EXEEXT)
+ @p='chunked_iostream_test$(EXEEXT)'; \
+ b='chunked_iostream_test'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4AsyncDocTest.log: D4AsyncDocTest$(EXEEXT)
+ @p='D4AsyncDocTest$(EXEEXT)'; \
+ b='D4AsyncDocTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+DMRTest.log: DMRTest$(EXEEXT)
+ @p='DMRTest$(EXEEXT)'; \
+ b='DMRTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4FilterClauseTest.log: D4FilterClauseTest$(EXEEXT)
+ @p='D4FilterClauseTest$(EXEEXT)'; \
+ b='D4FilterClauseTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+D4SequenceTest.log: D4SequenceTest$(EXEEXT)
+ @p='D4SequenceTest$(EXEEXT)'; \
+ b='D4SequenceTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+DmrRoundTripTest.log: DmrRoundTripTest$(EXEEXT)
+ @p='DmrRoundTripTest$(EXEEXT)'; \
+ b='DmrRoundTripTest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+DmrToDap2Test.log: DmrToDap2Test$(EXEEXT)
+ @p='DmrToDap2Test$(EXEEXT)'; \
+ b='DmrToDap2Test'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+ @p='$<'; \
+ $(am__set_b); \
+ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ at am__EXEEXT_TRUE@.test$(EXEEXT).log:
+ at am__EXEEXT_TRUE@ @p='$<'; \
+ at am__EXEEXT_TRUE@ $(am__set_b); \
+ at am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+ at am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
+ at am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+ at am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1643,13 +2332,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -1687,11 +2373,19 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -1775,13 +2469,12 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
- ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-TESTS check-am check-local clean \
- clean-checkPROGRAMS clean-generic clean-libtool ctags \
- ctags-recursive distclean distclean-compile distclean-generic \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-TESTS check-am check-local clean clean-checkPROGRAMS \
+ clean-generic clean-libtool cscopelist-am ctags ctags-am \
+ distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
@@ -1791,7 +2484,7 @@ uninstall-am:
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
+ recheck tags tags-am uninstall uninstall-am
test_config.h: test_config.h.in Makefile
diff --git a/unit-tests/MarshallerTest.cc b/unit-tests/MarshallerTest.cc
index c9a4aa4..d2f42da 100644
--- a/unit-tests/MarshallerTest.cc
+++ b/unit-tests/MarshallerTest.cc
@@ -58,57 +58,57 @@ namespace libdap {
class MarshallerTest: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE( MarshallerTest );
+ CPPUNIT_TEST_SUITE (MarshallerTest);
- CPPUNIT_TEST(simple_types_file_serialize_test);
+ CPPUNIT_TEST (simple_types_file_serialize_test);
- CPPUNIT_TEST(array_file_serialize_test);
- CPPUNIT_TEST(structure_file_serialize_test);
- CPPUNIT_TEST(grid_file_serialize_test);
- CPPUNIT_TEST(sequence_file_serialize_test);
+ CPPUNIT_TEST (array_file_serialize_test);
+ CPPUNIT_TEST (structure_file_serialize_test);
+ CPPUNIT_TEST (grid_file_serialize_test);
+ CPPUNIT_TEST (sequence_file_serialize_test);
- CPPUNIT_TEST(simple_types_file_deserialize_test);
- CPPUNIT_TEST(array_file_deserialize_test);
- CPPUNIT_TEST(structure_file_deserialize_test);
- CPPUNIT_TEST(grid_file_deserialize_test);
- CPPUNIT_TEST(sequence_file_deserialize_test);
+ CPPUNIT_TEST (simple_types_file_deserialize_test);
+ CPPUNIT_TEST (array_file_deserialize_test);
+ CPPUNIT_TEST (structure_file_deserialize_test);
+ CPPUNIT_TEST (grid_file_deserialize_test);
+ CPPUNIT_TEST (sequence_file_deserialize_test);
- CPPUNIT_TEST(simple_types_stream_serialize_test);
- CPPUNIT_TEST(array_stream_serialize_test);
- CPPUNIT_TEST(array_stream_deserialize_test);
+ CPPUNIT_TEST (simple_types_stream_serialize_test);
+ CPPUNIT_TEST (array_stream_serialize_test);
+ CPPUNIT_TEST (array_stream_deserialize_test);
- CPPUNIT_TEST(array_stream_serialize_test_2);
- CPPUNIT_TEST(array_stream_serialize_test_3);
- CPPUNIT_TEST(array_stream_serialize_test_4);
+ CPPUNIT_TEST (array_stream_serialize_test_2);
+ CPPUNIT_TEST (array_stream_serialize_test_3);
+ CPPUNIT_TEST (array_stream_serialize_test_4);
- CPPUNIT_TEST(array_f32_stream_serialize_test);
- CPPUNIT_TEST(array_f32_stream_deserialize_test);
- CPPUNIT_TEST(array_f32_stream_serialize_test_2);
+ CPPUNIT_TEST (array_f32_stream_serialize_test);
+ CPPUNIT_TEST (array_f32_stream_deserialize_test);
+ CPPUNIT_TEST (array_f32_stream_serialize_test_2);
- CPPUNIT_TEST(array_f64_stream_serialize_test);
- CPPUNIT_TEST(array_f64_stream_deserialize_test);
- CPPUNIT_TEST(array_f64_stream_serialize_test_2);
+ CPPUNIT_TEST (array_f64_stream_serialize_test);
+ CPPUNIT_TEST (array_f64_stream_deserialize_test);
+ CPPUNIT_TEST (array_f64_stream_serialize_test_2);
- CPPUNIT_TEST(structure_stream_serialize_test);
- CPPUNIT_TEST(grid_stream_serialize_test);
- CPPUNIT_TEST(sequence_stream_serialize_test);
+ CPPUNIT_TEST (structure_stream_serialize_test);
+ CPPUNIT_TEST (grid_stream_serialize_test);
+ CPPUNIT_TEST (sequence_stream_serialize_test);
- CPPUNIT_TEST(simple_types_stream_deserialize_test);
- CPPUNIT_TEST(structure_stream_deserialize_test);
- CPPUNIT_TEST(grid_stream_deserialize_test);
- CPPUNIT_TEST(sequence_stream_deserialize_test);
+ CPPUNIT_TEST (simple_types_stream_deserialize_test);
+ CPPUNIT_TEST (structure_stream_deserialize_test);
+ CPPUNIT_TEST (grid_stream_deserialize_test);
+ CPPUNIT_TEST (sequence_stream_deserialize_test);
- CPPUNIT_TEST(array_stream_put_vector_thread_test);
- CPPUNIT_TEST(array_stream_put_vector_thread_test_2);
- CPPUNIT_TEST(array_stream_put_vector_thread_test_3);
+ CPPUNIT_TEST (array_stream_put_vector_thread_test);
+ CPPUNIT_TEST (array_stream_put_vector_thread_test_2);
+ CPPUNIT_TEST (array_stream_put_vector_thread_test_3);
- CPPUNIT_TEST(array_stream_put_vector_thread_test_4);
- CPPUNIT_TEST(array_stream_put_vector_thread_test_5);
+ CPPUNIT_TEST (array_stream_put_vector_thread_test_4);
+ CPPUNIT_TEST (array_stream_put_vector_thread_test_5);
#if 1
- CPPUNIT_TEST(array_stream_serialize_part_thread_test);
- CPPUNIT_TEST(array_stream_serialize_part_thread_test_2);
- CPPUNIT_TEST(array_stream_serialize_part_thread_test_3);
+ CPPUNIT_TEST (array_stream_serialize_part_thread_test);
+ CPPUNIT_TEST (array_stream_serialize_part_thread_test_2);
+ CPPUNIT_TEST (array_stream_serialize_part_thread_test_3);
#endif
CPPUNIT_TEST_SUITE_END( );
@@ -146,8 +146,8 @@ CPPUNIT_TEST_SUITE( MarshallerTest );
public:
MarshallerTest() :
- b(0), i16(0), i32(0), ui16(0), ui32(0), f32(0), f64(0), str(0), url(0), ab(0), arr(0), a_f32(0), arr_f32(0),
- a_f64(0), arr_f64(0), s(0), dds(&ttf, "dds")
+ b(0), i16(0), i32(0), ui16(0), ui32(0), f32(0), f64(0), str(0), url(0), ab(0), arr(0), a_f32(0), arr_f32(0), a_f64(
+ 0), arr_f64(0), s(0), dds(&ttf, "dds")
{
url_value = "http://dcz.gso.uri.edu/avhrr-archive/archive.html";
}
@@ -370,7 +370,7 @@ public:
dods_byte fdb[farr.length() * sizeof(dods_byte)];
farr.value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], farr.length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
}
catch (Error &e) {
string err = "failed:" + e.get_error_message();
@@ -419,7 +419,8 @@ public:
CPPUNIT_ASSERT(fsi32_p->value() == i32->value());
Str *fsstr_p = dynamic_cast<Str *>(fs.var("fsstr"));
- CPPUNIT_ASSERT(fsstr_p); DBG2(cerr << "fsstr_p->value(): " << fsstr_p->value() << endl);
+ CPPUNIT_ASSERT(fsstr_p);
+ DBG2(cerr << "fsstr_p->value(): " << fsstr_p->value() << endl);
CPPUNIT_ASSERT(fsstr_p->value().find("Silly test string:") != string::npos);
BaseType *bt = fs.var("fsab");
@@ -430,7 +431,7 @@ public:
fsarr_p->value(fdb);
CPPUNIT_ASSERT(fsarr_p->length() == arr->length());
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], fsarr_p->length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], fsarr_p->length() * sizeof(dods_byte)));
}
catch (Error &e) {
string err = "failed:" + e.get_error_message();
@@ -497,7 +498,7 @@ public:
dods_byte fdb[tg.get_array()->length() * sizeof(dods_byte)];
tg.get_array()->value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], tg.get_array()->length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], tg.get_array()->length() * sizeof(dods_byte)));
// Should test the map values here, but skip that for now...
}
@@ -568,7 +569,7 @@ public:
CPPUNIT_ASSERT(arr_p);
arr_p->value(fdb);
CPPUNIT_ASSERT(arr_p->length() == arr->length());
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], arr_p->length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], arr_p->length() * sizeof(dods_byte)));
Sequence *seq_p = dynamic_cast<Sequence *>((*row)[2]);
CPPUNIT_ASSERT(seq_p);
unsigned int num_rows_sub = seq_p->number_of_rows();
@@ -711,7 +712,7 @@ public:
dods_byte fdb[arr->length() * sizeof(dods_byte)];
farr.value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], farr.length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
}
catch (Error &e) {
string err = "failed:" + e.get_error_message();
@@ -733,24 +734,24 @@ public:
DBG(cerr << "arr->var()->width(): " << arr->var()->width() << endl);
switch (arr->var()->type()) {
- case dods_byte_c:
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c:
- fm.put_vector_part(arr->get_buf(), arr->length(), arr->var()->width(), arr->var()->type());
- fm.put_vector_end();
- break;
-
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ case dods_byte_c:
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c:
+ fm.put_vector_part(arr->get_buf(), arr->length(), arr->var()->width(), arr->var()->type());
+ fm.put_vector_end();
+ break;
+
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
- catch( Error &e ) {
+ catch (Error &e) {
string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL( err.c_str() );
+ CPPUNIT_FAIL(err.c_str());
}
// now test the file contents to see if the correct stuff was serialized.
@@ -773,21 +774,21 @@ public:
const int size_of_first_part = 4;
switch (arr->var()->type()) {
- case dods_byte_c:
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c:
- fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
- fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
- arr->var()->width(), arr->var()->type());
- fm.put_vector_end();
- break;
-
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ case dods_byte_c:
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c:
+ fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
+ fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
+ arr->var()->width(), arr->var()->type());
+ fm.put_vector_end();
+ break;
+
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
catch (Error &e) {
@@ -815,21 +816,21 @@ public:
const int size_of_first_part = 5;
switch (arr->var()->type()) {
- case dods_byte_c:
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c:
- fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
- fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
- arr->var()->width(), arr->var()->type());
- fm.put_vector_end();
- break;
-
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ case dods_byte_c:
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c:
+ fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
+ fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
+ arr->var()->width(), arr->var()->type());
+ fm.put_vector_end();
+ break;
+
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
catch (Error &e) {
@@ -878,7 +879,7 @@ public:
vector<dods_float32> fd_f32(arr->length());
farr.value(&fd_f32[0]);
- CPPUNIT_ASSERT(!memcmp((void * )&fd_f32[0], (void * )&d_f32[0], farr.length() * sizeof(dods_float32)));
+ CPPUNIT_ASSERT(!memcmp((void *) &fd_f32[0], (void *) &d_f32[0], farr.length() * sizeof(dods_float32)));
}
catch (Error &e) {
string err = "failed:" + e.get_error_message();
@@ -895,37 +896,37 @@ public:
DBG(cerr << "arr_f32->length(): " << arr_f32->length() << endl);
fm.put_vector_start(arr_f32->length());
- DBG(cerr << "&arr_f32->get_buf(): " << hex << (void *)arr_f32->get_buf() << dec << endl);
+ DBG(cerr << "&arr_f32->get_buf(): " << hex << (void * )arr_f32->get_buf() << dec << endl);
DBG(cerr << "arr_f32->var()->width(): " << arr_f32->var()->width() << endl);
const int size_of_first_part = 5;
switch (arr_f32->var()->type()) {
- case dods_byte_c:
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c:
- fm.put_vector_part(arr_f32->get_buf(), size_of_first_part, arr_f32->var()->width(),
- arr_f32->var()->type());
-
- // For this call, we have to pass the memory location of the rest of the array,
- // so we do a little calculation since get_buf() returns a char *. Actual code
- // would not need to do that.
- fm.put_vector_part(arr_f32->get_buf() + (size_of_first_part * arr_f32->var()->width()),
- arr_f32->length() - size_of_first_part, arr_f32->var()->width(), arr_f32->var()->type());
- fm.put_vector_end();
- break;
-
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ case dods_byte_c:
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c:
+ fm.put_vector_part(arr_f32->get_buf(), size_of_first_part, arr_f32->var()->width(),
+ arr_f32->var()->type());
+
+ // For this call, we have to pass the memory location of the rest of the array,
+ // so we do a little calculation since get_buf() returns a char *. Actual code
+ // would not need to do that.
+ fm.put_vector_part(arr_f32->get_buf() + (size_of_first_part * arr_f32->var()->width()),
+ arr_f32->length() - size_of_first_part, arr_f32->var()->width(), arr_f32->var()->type());
+ fm.put_vector_end();
+ break;
+
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
- catch( Error &e ) {
+ catch (Error &e) {
string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL( err.c_str() );
+ CPPUNIT_FAIL(err.c_str());
}
// now test the file contents to see if the correct stuff was serialized.
@@ -968,7 +969,7 @@ public:
vector<dods_float64> fd_f64(arr->length());
farr.value(&fd_f64[0]);
- CPPUNIT_ASSERT(!memcmp((void * )&fd_f64[0], (void * )&d_f64[0], farr.length() * sizeof(dods_float64)));
+ CPPUNIT_ASSERT(!memcmp((void *) &fd_f64[0], (void *) &d_f64[0], farr.length() * sizeof(dods_float64)));
}
catch (Error &e) {
string err = "failed:" + e.get_error_message();
@@ -985,37 +986,37 @@ public:
DBG(cerr << "arr_f64->length(): " << arr_f64->length() << endl);
fm.put_vector_start(arr_f64->length());
- DBG(cerr << "&arr_f64->get_buf(): " << hex << (void *)arr_f64->get_buf() << dec << endl);
+ DBG(cerr << "&arr_f64->get_buf(): " << hex << (void * )arr_f64->get_buf() << dec << endl);
DBG(cerr << "arr_f64->var()->width(): " << arr_f64->var()->width() << endl);
const int size_of_first_part = 5;
switch (arr_f64->var()->type()) {
- case dods_byte_c:
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c:
- fm.put_vector_part(arr_f64->get_buf(), size_of_first_part, arr_f64->var()->width(),
- arr_f64->var()->type());
-
- // For this call, we have to pass the memory location of the rest of the array,
- // so we do a little calculation since get_buf() returns a char *. Actual code
- // would not need to do that.
- fm.put_vector_part(arr_f64->get_buf() + (size_of_first_part * arr_f64->var()->width()),
- arr_f64->length() - size_of_first_part, arr_f64->var()->width(), arr_f64->var()->type());
- fm.put_vector_end();
- break;
-
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ case dods_byte_c:
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c:
+ fm.put_vector_part(arr_f64->get_buf(), size_of_first_part, arr_f64->var()->width(),
+ arr_f64->var()->type());
+
+ // For this call, we have to pass the memory location of the rest of the array,
+ // so we do a little calculation since get_buf() returns a char *. Actual code
+ // would not need to do that.
+ fm.put_vector_part(arr_f64->get_buf() + (size_of_first_part * arr_f64->var()->width()),
+ arr_f64->length() - size_of_first_part, arr_f64->var()->width(), arr_f64->var()->type());
+ fm.put_vector_end();
+ break;
+
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
- catch( Error &e ) {
+ catch (Error &e) {
string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL( err.c_str() );
+ CPPUNIT_FAIL(err.c_str());
}
// now test the file contents to see if the correct stuff was serialized.
@@ -1078,7 +1079,7 @@ public:
CPPUNIT_ASSERT(fsarr_p->length() == arr->length());
dods_byte fdb[fsarr_p->length() * sizeof(dods_byte)];
fsarr_p->value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], fsarr_p->length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], fsarr_p->length() * sizeof(dods_byte)));
}
catch (Error &e) {
string err = "failed:" + e.get_error_message();
@@ -1149,7 +1150,7 @@ public:
dods_byte fdb[tg.get_array()->length() * sizeof(dods_byte)];
tg.get_array()->value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], tg.get_array()->length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], tg.get_array()->length() * sizeof(dods_byte)));
}
catch (Error &e) {
string err = "failed:" + e.get_error_message();
@@ -1222,7 +1223,7 @@ public:
CPPUNIT_ASSERT(arr_p);
arr_p->value(fdb);
CPPUNIT_ASSERT(arr_p->length() == arr->length());
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], arr_p->length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], arr_p->length() * sizeof(dods_byte)));
Sequence *seq_p = dynamic_cast<Sequence *>((*row)[2]);
CPPUNIT_ASSERT(seq_p);
unsigned int num_rows_sub = seq_p->number_of_rows();
@@ -1255,26 +1256,26 @@ public:
XDRStreamMarshaller fm(f);
switch (arr->var()->type()) {
- case dods_byte_c: {
- fm.put_vector/*_thread*/(arr->get_buf(), arr->length(), *arr);
- break;
- }
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c:
- throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
- break;
-
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ case dods_byte_c: {
+ fm.put_vector/*_thread*/(arr->get_buf(), arr->length(), *arr);
+ break;
+ }
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c:
+ throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
+ break;
+
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
- catch( Error &e ) {
+ catch (Error &e) {
string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL( err.c_str() );
+ CPPUNIT_FAIL(err.c_str());
}
//int status = system("cmp a_test.file a_test_2.file >/dev/null 2>&1");
@@ -1289,34 +1290,34 @@ public:
XDRStreamMarshaller fm(f);
switch (arr->var()->type()) {
- case dods_byte_c: {
- DBG(cerr << "arr->get_buf(): " << hex << (void*)arr->get_buf() << dec << endl);
-
- fm.put_vector(arr->get_buf(), arr->length(), *arr);
- fm.put_vector(arr->get_buf(), arr->length(), *arr);
- fm.put_vector(arr->get_buf(), arr->length(), *arr);
- fm.put_vector(arr->get_buf(), arr->length(), *arr);
- break;
- }
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c:
- throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
- break;
-
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ case dods_byte_c: {
+ DBG(cerr << "arr->get_buf(): " << hex << (void* )arr->get_buf() << dec << endl);
+
+ fm.put_vector(arr->get_buf(), arr->length(), *arr);
+ fm.put_vector(arr->get_buf(), arr->length(), *arr);
+ fm.put_vector(arr->get_buf(), arr->length(), *arr);
+ fm.put_vector(arr->get_buf(), arr->length(), *arr);
+ break;
+ }
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c:
+ throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
+ break;
+
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
- catch( Error &e ) {
+ catch (Error &e) {
string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL( err.c_str() );
+ CPPUNIT_FAIL(err.c_str());
}
- try{
+ try {
FILE *sf = fopen("a_test_pv_2.file", "r");
XDRFileUnMarshaller um(sf);
@@ -1330,24 +1331,24 @@ public:
dods_byte fdb[arr->length() * sizeof(dods_byte)];
farr.value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], farr.length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
// now get three more arrays of the same size
farr.deserialize(um, &dds, false);
farr.value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], farr.length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
farr.deserialize(um, &dds, false);
farr.value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], farr.length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
farr.deserialize(um, &dds, false);
farr.value(fdb);
- CPPUNIT_ASSERT(!memcmp((void * )fdb, (void * )&db[0], farr.length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) &db[0], farr.length() * sizeof(dods_byte)));
}
- catch( Error &e ) {
+ catch (Error &e) {
string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL( err.c_str() );
+ CPPUNIT_FAIL(err.c_str());
}
}
@@ -1358,36 +1359,36 @@ public:
XDRStreamMarshaller fm(f);
switch (arr->var()->type()) {
- case dods_byte_c: {
- DBG(cerr << "arr->get_buf(): " << hex << (void*)arr->get_buf() << dec << endl);
-
- // test sequencing of threads and non-threaded calls. Note that for the
- // non-threaded calls, we pass a _reference_ to the object and it's an
- // ignored parameter (left over cruft...).
- fm.put_vector(arr->get_buf(), arr->length(), *arr);
- fm.put_vector(arr->get_buf(), arr->length(), *arr);
- fm.put_vector(arr->get_buf(), arr->length(), *arr);
- fm.put_vector(arr->get_buf(), arr->length(), *arr);
-
- // No need to wait since put_vector() should be doing that
- break;
- }
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c:
- throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
- break;
-
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ case dods_byte_c: {
+ DBG(cerr << "arr->get_buf(): " << hex << (void* )arr->get_buf() << dec << endl);
+
+ // test sequencing of threads and non-threaded calls. Note that for the
+ // non-threaded calls, we pass a _reference_ to the object and it's an
+ // ignored parameter (left over cruft...).
+ fm.put_vector(arr->get_buf(), arr->length(), *arr);
+ fm.put_vector(arr->get_buf(), arr->length(), *arr);
+ fm.put_vector(arr->get_buf(), arr->length(), *arr);
+ fm.put_vector(arr->get_buf(), arr->length(), *arr);
+
+ // No need to wait since put_vector() should be doing that
+ break;
+ }
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c:
+ throw InternalErr(__FILE__, __LINE__, "Unit test fail; array is a byte array.");
+ break;
+
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
- catch( Error &e ) {
+ catch (Error &e) {
string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL( err.c_str() );
+ CPPUNIT_FAIL(err.c_str());
}
// this should be identical to the output from pv_2 (the previous test).
@@ -1462,7 +1463,7 @@ public:
CPPUNIT_FAIL(err.c_str());
}
- try{
+ try {
FILE *sf = fopen("a_f32_test_pv_2.file", "r");
XDRFileUnMarshaller um(sf);
@@ -1476,16 +1477,16 @@ public:
dods_float32 fd_32[arr->length() * sizeof(dods_float32)];
farr.value(fd_32);
- CPPUNIT_ASSERT(!memcmp((void * )fd_32, (void * )&d_f32[0], farr.length() * sizeof(dods_float32)));
+ CPPUNIT_ASSERT(!memcmp((void *) fd_32, (void *) &d_f32[0], farr.length() * sizeof(dods_float32)));
// now get three more arrays of the same size
farr.deserialize(um, &dds, false);
farr.value(fd_32);
- CPPUNIT_ASSERT(!memcmp((void * )fd_32, (void * )&d_f32[0], farr.length() * sizeof(dods_byte)));
+ CPPUNIT_ASSERT(!memcmp((void *) fd_32, (void *) &d_f32[0], farr.length() * sizeof(dods_byte)));
}
- catch( Error &e ) {
+ catch (Error &e) {
string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL( err.c_str() );
+ CPPUNIT_FAIL(err.c_str());
}
}
@@ -1502,24 +1503,24 @@ public:
const int size_of_first_part = 5;
switch (arr->var()->type()) {
- case dods_byte_c:
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c: {
- fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
-
- fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
- arr->var()->width(), arr->var()->type());
-
- fm.put_vector_end(); // forces a wait on the thread
- break;
- }
+ case dods_byte_c:
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c: {
+ fm.put_vector_part(arr->get_buf(), size_of_first_part, arr->var()->width(), arr->var()->type());
+
+ fm.put_vector_part(arr->get_buf() + size_of_first_part, arr->length() - size_of_first_part,
+ arr->var()->width(), arr->var()->type());
+
+ fm.put_vector_end(); // forces a wait on the thread
+ break;
+ }
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
catch (Error &e) {
@@ -1543,24 +1544,25 @@ public:
const int size_of_first_part = 5;
switch (arr_f32->var()->type()) {
- case dods_byte_c:
- case dods_int16_c:
- case dods_uint16_c:
- case dods_int32_c:
- case dods_uint32_c:
- case dods_float32_c:
- case dods_float64_c: {
- fm.put_vector_part(arr_f32->get_buf(), size_of_first_part, arr_f32->var()->width(), arr_f32->var()->type());
-
- fm.put_vector_part(arr_f32->get_buf() + (size_of_first_part * arr_f32->var()->width()),
- arr_f32->length() - size_of_first_part, arr_f32->var()->width(), arr_f32->var()->type());
-
- fm.put_vector_end(); // forces a wait on the thread
- break;
- }
+ case dods_byte_c:
+ case dods_int16_c:
+ case dods_uint16_c:
+ case dods_int32_c:
+ case dods_uint32_c:
+ case dods_float32_c:
+ case dods_float64_c: {
+ fm.put_vector_part(arr_f32->get_buf(), size_of_first_part, arr_f32->var()->width(),
+ arr_f32->var()->type());
+
+ fm.put_vector_part(arr_f32->get_buf() + (size_of_first_part * arr_f32->var()->width()),
+ arr_f32->length() - size_of_first_part, arr_f32->var()->width(), arr_f32->var()->type());
+
+ fm.put_vector_end(); // forces a wait on the thread
+ break;
+ }
- default:
- throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
+ default:
+ throw InternalErr(__FILE__, __LINE__, "Implemented for numeric simple types only");
}
}
@@ -1614,16 +1616,13 @@ public:
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( MarshallerTest );
+CPPUNIT_TEST_SUITE_REGISTRATION (MarshallerTest);
} // namepsace libdap
int main(int argc, char*argv[])
{
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
@@ -1631,10 +1630,22 @@ int main(int argc, char*argv[])
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: MarshallerTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::MarshallerTest::suite()->getTests();
+ unsigned int prefix_len = libdap::MarshallerTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -1643,9 +1654,9 @@ int main(int argc, char*argv[])
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::MarshallerTest::") + argv[i++];
- DBG(cerr << "test: " << test << endl);
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::MarshallerTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/RCReaderTest.cc b/unit-tests/RCReaderTest.cc
index a0008cc..cbb13e7 100644
--- a/unit-tests/RCReaderTest.cc
+++ b/unit-tests/RCReaderTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -59,21 +58,27 @@ static char dods_conf_ev[1024] = "";
#undef DBG
#define DBG(x) do { if (debug) (x); } while(false);
-namespace libdap
-{
+namespace libdap {
-class RCReaderTest : public TestFixture {
+class RCReaderTest: public TestFixture {
private:
RCReader *rcr;
protected:
public:
- RCReaderTest() : rcr(RCReader::instance()) {}
+ RCReaderTest() :
+ rcr(RCReader::instance())
+ {
+ }
- void setUp () {}
+ void setUp()
+ {
+ }
- void tearDown() {}
+ void tearDown()
+ {
+ }
/** Put values in an environment variable. This should be used only
* for the env var 'DODS_CONF' and should never pass in values longer
@@ -83,45 +88,51 @@ public:
* so any value passed in from the heap that might be freed or from the
* stack that could be popped will cause a memory access error.
*/
- void my_putenv(const string &value) {
- strncpy(dods_conf_ev, value.c_str(), 1024);;
+ void my_putenv(const string &value)
+ {
+ strncpy(dods_conf_ev, value.c_str(), 1024);
+ ;
putenv(dods_conf_ev);
}
- CPPUNIT_TEST_SUITE(RCReaderTest);
-
- CPPUNIT_TEST(check_env_var_test1);
- CPPUNIT_TEST(check_env_var_test2);
- CPPUNIT_TEST(check_env_var_test3);
- CPPUNIT_TEST(check_env_var_test4);
- CPPUNIT_TEST(check_env_var_test5);
- CPPUNIT_TEST(instance_test1);
- CPPUNIT_TEST(instance_test2);
- CPPUNIT_TEST(proxy_test1);
- CPPUNIT_TEST(proxy_test2);
- CPPUNIT_TEST(proxy_test3);
- CPPUNIT_TEST(proxy_test4);
- CPPUNIT_TEST(proxy_test5);
- CPPUNIT_TEST(validate_ssl_test);
+ CPPUNIT_TEST_SUITE (RCReaderTest);
+
+ CPPUNIT_TEST (check_env_var_test1);
+ CPPUNIT_TEST (check_env_var_test2);
+ CPPUNIT_TEST (check_env_var_test3);
+ CPPUNIT_TEST (check_env_var_test4);
+ CPPUNIT_TEST (check_env_var_test5);
+ CPPUNIT_TEST (instance_test1);
+ CPPUNIT_TEST (instance_test2);
+ CPPUNIT_TEST (proxy_test1);
+ CPPUNIT_TEST (proxy_test2);
+ CPPUNIT_TEST (proxy_test3);
+ CPPUNIT_TEST (proxy_test4);
+ CPPUNIT_TEST (proxy_test5);
+ CPPUNIT_TEST (validate_ssl_test);
CPPUNIT_TEST_SUITE_END();
- void check_env_var_test1() {
+ void check_env_var_test1()
+ {
my_putenv("DODS_CONF=");
CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == "");
}
- void check_env_var_test2() {
+ void check_env_var_test2()
+ {
my_putenv("DODS_CONF=Nothing_sensible");
CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == "");
}
- void check_env_var_test3() {
+ void check_env_var_test3()
+ {
my_putenv("DODS_CONF=/etc/passwd");
CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == "/etc/passwd");
}
- void check_env_var_test4() {
+ void check_env_var_test4()
+ {
// Set DODS_CONF to the CWD plus .dodsrc, create file called .dodsrc
// in the CWD and test to see if check_env_var finds it.
char cwd[1024];
@@ -137,7 +148,8 @@ public:
remove(rc.c_str());
}
- void check_env_var_test5() {
+ void check_env_var_test5()
+ {
// In this test we *don't* create the file, just set DODS_CONF to the
// directory and see if check_env_var() makes the RC file.
char cwd[1024];
@@ -149,28 +161,27 @@ public:
string rc = string(cwd) + string("/.dodsrc");
CPPUNIT_ASSERT(rcr->check_env_var("DODS_CONF") == rc);
struct stat stat_info;
- CPPUNIT_ASSERT(stat(rc.c_str(), &stat_info) == 0 &&
- S_ISREG(stat_info.st_mode));
+ CPPUNIT_ASSERT(stat(rc.c_str(), &stat_info) == 0 && S_ISREG(stat_info.st_mode));
remove(rc.c_str());
}
- void instance_test1() {
+ void instance_test1()
+ {
// This test assumes that HOME *is* defined. We should find the
// .dodsrc there. If it's not there, we should create one there.
my_putenv("DODS_CONF=");
string home = getenv("HOME");
- if (*home.rbegin() != '/')
- home += "/";
+ if (*home.rbegin() != '/') home += "/";
RCReader::delete_instance();
RCReader::initialize_instance();
RCReader *reader = RCReader::instance();
CPPUNIT_ASSERT(reader->d_rc_file_path == home + string(".dodsrc"));
DBG(cerr << "Cache root: " << reader->get_dods_cache_root() << endl);
- CPPUNIT_ASSERT(reader->get_dods_cache_root()
- == home + string(".dods_cache/"));
+ CPPUNIT_ASSERT(reader->get_dods_cache_root() == home + string(".dods_cache/"));
}
- void instance_test2() {
+ void instance_test2()
+ {
// Set DODS_CONF to create a .dodsrc in the CWD, then check to make
// sure that .dodsrc has the correct cache root.
char cwd[1024];
@@ -187,17 +198,16 @@ public:
RCReader::initialize_instance();
RCReader *reader = RCReader::instance();
DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
- CPPUNIT_ASSERT(reader->d_rc_file_path
- == string(cwd) + string("/.dodsrc"));
+ CPPUNIT_ASSERT(reader->d_rc_file_path == string(cwd) + string("/.dodsrc"));
DBG(cerr << "Cache root: " << reader->get_dods_cache_root() << endl);
- CPPUNIT_ASSERT(reader->get_dods_cache_root()
- == string(cwd) + string("/.dods_cache/"));
+ CPPUNIT_ASSERT(reader->get_dods_cache_root() == string(cwd) + string("/.dods_cache/"));
}
// Read the proxy info from rcreader-testsuite/test1.rc
- void proxy_test1() {
- string rc = (string)"DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test1.rc" ;
+ void proxy_test1()
+ {
+ string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test1.rc";
DBG(cerr << "rc: " << rc << endl);
my_putenv(rc);
@@ -205,8 +215,7 @@ public:
RCReader::initialize_instance();
RCReader *reader = RCReader::instance();
DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
- CPPUNIT_ASSERT(reader->d_rc_file_path
- == (string)TEST_SRC_DIR + "/rcreader-testsuite/test1.rc");
+ CPPUNIT_ASSERT(reader->d_rc_file_path == (string) TEST_SRC_DIR + "/rcreader-testsuite/test1.rc");
CPPUNIT_ASSERT(reader->get_proxy_server_protocol() == "http");
string proxy = reader->get_proxy_server_host_url();
@@ -221,8 +230,9 @@ public:
CPPUNIT_ASSERT(reader->get_no_proxy_for_host() == "local.org");
}
- void proxy_test2() {
- string rc = (string)"DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test2.rc" ;
+ void proxy_test2()
+ {
+ string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test2.rc";
DBG(cerr << "rc: " << rc << endl);
my_putenv(rc);
@@ -230,8 +240,7 @@ public:
RCReader::initialize_instance();
RCReader *reader = RCReader::instance();
DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
- CPPUNIT_ASSERT(reader->d_rc_file_path
- == (string)TEST_SRC_DIR + "/rcreader-testsuite/test2.rc");
+ CPPUNIT_ASSERT(reader->d_rc_file_path == (string) TEST_SRC_DIR + "/rcreader-testsuite/test2.rc");
CPPUNIT_ASSERT(reader->get_proxy_server_protocol() == "http");
string proxy = reader->get_proxy_server_host_url();
@@ -243,8 +252,9 @@ public:
CPPUNIT_ASSERT(reader->get_proxy_server_userpw() == "");
}
- void proxy_test3() {
- string rc = (string)"DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test3.rc" ;
+ void proxy_test3()
+ {
+ string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test3.rc";
DBG(cerr << "rc: " << rc << endl);
my_putenv(rc);
@@ -253,14 +263,15 @@ public:
RCReader::initialize_instance();
CPPUNIT_ASSERT(!"initialize_instance() should throw Error.");
}
- catch(Error &e) {
+ catch (Error &e) {
DBG(cerr << e.get_error_message() << endl);
CPPUNIT_ASSERT(e.get_error_message() != "");
}
}
- void proxy_test4() {
- string rc = (string)"DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test4.rc" ;
+ void proxy_test4()
+ {
+ string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test4.rc";
DBG(cerr << "rc: " << rc << endl);
my_putenv(rc);
@@ -269,8 +280,7 @@ public:
RCReader::initialize_instance();
RCReader *reader = RCReader::instance();
DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
- CPPUNIT_ASSERT(reader->d_rc_file_path
- == (string)TEST_SRC_DIR + "/rcreader-testsuite/test4.rc");
+ CPPUNIT_ASSERT(reader->d_rc_file_path == (string) TEST_SRC_DIR + "/rcreader-testsuite/test4.rc");
CPPUNIT_ASSERT(reader->get_proxy_server_protocol() == "http");
string proxy = reader->get_proxy_server_host_url();
@@ -281,14 +291,15 @@ public:
CPPUNIT_ASSERT(reader->get_proxy_server_port() == 3128);
CPPUNIT_ASSERT(reader->get_proxy_server_userpw() == "jimg:test");
}
- catch(Error &e) {
+ catch (Error &e) {
DBG(cerr << e.get_error_message() << endl);
CPPUNIT_ASSERT(e.get_error_message() != "");
}
}
- void proxy_test5() {
- string rc = (string)"DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test5.rc" ;
+ void proxy_test5()
+ {
+ string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/test5.rc";
DBG(cerr << "rc: " << rc << endl);
my_putenv(rc);
@@ -297,8 +308,7 @@ public:
RCReader::initialize_instance();
RCReader *reader = RCReader::instance();
DBG(cerr << "RC path: " << reader->d_rc_file_path << endl);
- CPPUNIT_ASSERT(reader->d_rc_file_path
- == (string)TEST_SRC_DIR + "/rcreader-testsuite/test5.rc");
+ CPPUNIT_ASSERT(reader->d_rc_file_path == (string) TEST_SRC_DIR + "/rcreader-testsuite/test5.rc");
string proxy = reader->get_proxy_server_host_url();
DBG(cerr << "get_proxy_server_host_url(): " << proxy << endl);
CPPUNIT_ASSERT(reader->get_proxy_server_protocol() == "http");
@@ -309,17 +319,17 @@ public:
CPPUNIT_ASSERT(reader->get_proxy_server_port() == 3128);
CPPUNIT_ASSERT(reader->get_proxy_server_userpw() == "jimg:test");
}
- catch(Error &e) {
+ catch (Error &e) {
DBG(cerr << e.get_error_message() << endl);
CPPUNIT_ASSERT(e.get_error_message() != "");
}
}
-
// This simple test checks to see that the VALIDATE_SSL parameter is
// read correctly.
- void validate_ssl_test() {
- string rc = (string)"DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodssrc_ssl_1" ;
+ void validate_ssl_test()
+ {
+ string rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodssrc_ssl_1";
DBG(cerr << "rc: " << rc << endl);
my_putenv(rc);
@@ -336,7 +346,7 @@ public:
// string object) because the code casts away the const-ness of the
// char* returned by c_str() and putenv does odd stuff with it. There's
// nothing good about using env vars...
- rc = (string)"DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodssrc_ssl_2" ;
+ rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodssrc_ssl_2";
DBG(cerr << "rc: " << rc << endl);
my_putenv(rc);
@@ -344,14 +354,12 @@ public:
RCReader::delete_instance();
RCReader::initialize_instance();
reader = RCReader::instance();
- DBG(cerr << "reader->check_env_var(\"DODS_CONF\"): "
- << reader->check_env_var("DODS_CONF") << endl);
- DBG(cerr << "reader->get_validate_ssl(): " << reader->get_validate_ssl()
- << endl);
+ DBG(cerr << "reader->check_env_var(\"DODS_CONF\"): " << reader->check_env_var("DODS_CONF") << endl);
+ DBG(cerr << "reader->get_validate_ssl(): " << reader->get_validate_ssl() << endl);
CPPUNIT_ASSERT(reader->get_validate_ssl() == 1);
// Param cleared in file
- rc = (string)"DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodsrc_ssl_3" ;
+ rc = (string) "DODS_CONF=" + TEST_SRC_DIR + "/rcreader-testsuite/dodsrc_ssl_3";
DBG(cerr << "rc: " << rc << endl);
my_putenv(rc);
@@ -359,32 +367,41 @@ public:
RCReader::delete_instance();
RCReader::initialize_instance();
reader = RCReader::instance();
- DBG(cerr << "reader->get_validate_ssl(): " << reader->get_validate_ssl()
- << endl);
+ DBG(cerr << "reader->get_validate_ssl(): " << reader->get_validate_ssl() << endl);
CPPUNIT_ASSERT(reader->get_validate_ssl() == 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(RCReaderTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (RCReaderTest);
} // namespace libdap
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
- case 'd':
- debug = 1; // debug is a static global
- break;
- default:
- break;
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: RCReaderTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::RCReaderTest::suite()->getTests();
+ unsigned int prefix_len = libdap::RCReaderTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -393,9 +410,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::RCReaderTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::RCReaderTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/RegexTest.cc b/unit-tests/RegexTest.cc
index f07a2a1..6bb36b1 100644
--- a/unit-tests/RegexTest.cc
+++ b/unit-tests/RegexTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -32,34 +31,44 @@
#include "GNURegex.h"
#include "Error.h"
#include "debug.h"
+#include "GetOpt.h"
using namespace CppUnit;
using namespace libdap;
+static bool debug = false;
+
class RegexTest: public TestFixture {
private:
public:
- RegexTest() {}
- ~RegexTest() {}
+ RegexTest()
+ {
+ }
+ ~RegexTest()
+ {
+ }
- void setUp() {
- }
+ void setUp()
+ {
+ }
- void tearDown() {
+ void tearDown()
+ {
}
- CPPUNIT_TEST_SUITE( RegexTest );
+ CPPUNIT_TEST_SUITE (RegexTest);
- CPPUNIT_TEST(ctor_test);
- CPPUNIT_TEST(match_test);
+ CPPUNIT_TEST (ctor_test);
+ CPPUNIT_TEST (match_test);
#if 1
- CPPUNIT_TEST(search_test);
+ CPPUNIT_TEST (search_test);
#endif
CPPUNIT_TEST_SUITE_END();
- void ctor_test() {
+ void ctor_test()
+ {
try {
Regex r("abc");
CPPUNIT_ASSERT(1);
@@ -87,63 +96,98 @@ public:
CPPUNIT_ASSERT(!"Error building object");
}
}
-
- void match_test() {
+
+ void match_test()
+ {
Regex simple("abc");
string s1 = "123abcdef";
- DBG(cerr << "simple.match(s1.c_str(), s1.length()): "
- << simple.match(s1.c_str(), s1.length()) << endl);
+ DBG(cerr << "simple.match(s1.c_str(), s1.length()): "
+ << simple.match(s1.c_str(), s1.length()) << endl);
CPPUNIT_ASSERT(simple.match(s1.c_str(), s1.length()) == 3);
CPPUNIT_ASSERT(simple.match(s1.c_str(), s1.length(), 4) == -1);
-
+
Regex pattern("3.b");
- DBG(cerr << "pattern.match(s1.c_str(), s1.length()): "
- << pattern.match(s1.c_str(), s1.length()) << endl);
+ DBG(cerr << "pattern.match(s1.c_str(), s1.length()): "
+ << pattern.match(s1.c_str(), s1.length()) << endl);
CPPUNIT_ASSERT(pattern.match(s1.c_str(), s1.length()) == 3);
- string s2 = "123acd";
+ string s2 = "123acd";
CPPUNIT_ASSERT(pattern.match(s2.c_str(), s2.length()) == -1);
Regex exclusion("[^123]+");
- DBG(cerr << "exclusion.match(s1.c_str(), s1.length()): "
- << exclusion.match(s1.c_str(), s1.length()) << endl);
+ DBG(cerr << "exclusion.match(s1.c_str(), s1.length()): "
+ << exclusion.match(s1.c_str(), s1.length()) << endl);
CPPUNIT_ASSERT(exclusion.match(s1.c_str(), s1.length()) == 6);
-
+
Regex exclusion_range("[^0-9]+");
CPPUNIT_ASSERT(exclusion_range.match(s1.c_str(), s1.length()) == 6);
- }
+ }
- void search_test() {
+ void search_test()
+ {
int matchlen;
-
+
Regex simple("abc");
string s1 = "123abcdef";
CPPUNIT_ASSERT(simple.search(s1.c_str(), s1.length(), matchlen, 0) == 3);
CPPUNIT_ASSERT(matchlen == 3);
CPPUNIT_ASSERT(simple.search(s1.c_str(), s1.length(), matchlen, 4) == -1);
-
+
Regex pattern("[a-z]+");
CPPUNIT_ASSERT(pattern.search(s1.c_str(), s1.length(), matchlen) == 3);
CPPUNIT_ASSERT(matchlen == 6);
-
- string s2 = "123abc123abcd";
+
+ string s2 = "123abc123abcd";
CPPUNIT_ASSERT(pattern.search(s2.c_str(), s2.length(), matchlen) == 3);
CPPUNIT_ASSERT(matchlen == 3);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(RegexTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (RegexTest);
-int
-main( int, char** )
+int main(int argc, char*argv[])
{
- CppUnit::TextTestRunner runner;
- runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: RegexTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = RegexTest::suite()->getTests();
+ unsigned int prefix_len = RegexTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
- bool wasSuccessful = runner.run( "", false ) ;
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = RegexTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/SequenceTest.cc b/unit-tests/SequenceTest.cc
index 907d811..9dfdbd3 100644
--- a/unit-tests/SequenceTest.cc
+++ b/unit-tests/SequenceTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -56,8 +55,8 @@ int test_variable_sleep_interval;
// Note: MS VC++ won't tolerate the embedded newlines in strings, hence the \n
// is explicit.
-static const char *s_as_string = \
- "BaseType \\(0x.*\\):\n\
+static const char *s_as_string =
+ "BaseType \\(0x.*\\):\n\
_name: s\n\
_type: Sequence\n\
_dataset: \n\
@@ -97,19 +96,23 @@ BaseType \\(0x.*\\):\n\
static Regex s_regex(s_as_string);
-namespace libdap
-{
+namespace libdap {
-class SequenceTest : public TestFixture {
+class SequenceTest: public TestFixture {
private:
DDS *dds;
TestSequence *s, *ss, *ps, *sss, *ts, *tts;
public:
- SequenceTest() {}
- ~SequenceTest() {}
+ SequenceTest()
+ {
+ }
+ ~SequenceTest()
+ {
+ }
- void setUp() {
+ void setUp()
+ {
// Set up a simple sequence. Used to test ctor, assigment, et cetera.
s = new TestSequence("s");
s->add_var_nocopy(new TestInt32("i1"));
@@ -150,22 +153,24 @@ public:
dds->add_var_nocopy(sss);
}
- void tearDown() {
- delete dds; dds = 0;
+ void tearDown()
+ {
+ delete dds;
+ dds = 0;
}
- bool re_match(Regex &r, const char *s) {
+ bool re_match(Regex &r, const char *s)
+ {
int match_position = r.match(s, strlen(s));
- DBG(cerr << "match position: " << match_position
- << " string length: " << (int)strlen(s) << endl);
- return match_position == (int)strlen(s);
+ DBG(cerr << "match position: " << match_position << " string length: " << (int )strlen(s) << endl);
+ return match_position == (int) strlen(s);
}
- CPPUNIT_TEST_SUITE( SequenceTest );
+ CPPUNIT_TEST_SUITE (SequenceTest);
- CPPUNIT_TEST(ctor_test);
- CPPUNIT_TEST(assignment);
- CPPUNIT_TEST(copy_ctor);
+ CPPUNIT_TEST (ctor_test);
+ CPPUNIT_TEST (assignment);
+ CPPUNIT_TEST (copy_ctor);
#if 0
CPPUNIT_TEST(test_set_leaf_sequence);
CPPUNIT_TEST(test_set_leaf_sequence2);
@@ -345,14 +350,14 @@ public:
void test_set_leaf_sequence2() {
// Three level sequence
- sss->set_send_p(true); // set send_p for whole seq
+ sss->set_send_p(true);// set send_p for whole seq
// Now the lowest sequence is not longer to be sent. The middle sequence
// is the lowest with fields to be sent and so should be the leaf.
Sequence::Vars_iter i = sss->var_begin();
Sequence *inner = dynamic_cast<Sequence*>(*++i);
i = inner->var_begin();
inner = dynamic_cast<Sequence*>(*++i);
- inner->set_send_p(false); // now clear send_p for the inner most seq
+ inner->set_send_p(false);// now clear send_p for the inner most seq
sss->set_leaf_sequence(1);
CPPUNIT_ASSERT(!sss->is_leaf_sequence());
@@ -396,42 +401,55 @@ public:
}
#endif
- void assignment() {
+ void assignment()
+ {
Sequence ts2 = *s;
DBG(cerr << "ts2: " << ts2.toString() << endl);
CPPUNIT_ASSERT(re_match(s_regex, ts2.toString().c_str()));
}
- void ctor_test() {
- DBG(cerr << "s: " << s->toString() << endl);
- CPPUNIT_ASSERT(re_match(s_regex, s->toString().c_str()));
- }
+ void ctor_test()
+ {
+ DBG(cerr << "s: " << s->toString() << endl);
+ CPPUNIT_ASSERT(re_match(s_regex, s->toString().c_str()));
+ }
- void copy_ctor() {
+ void copy_ctor()
+ {
Sequence s2 = *s;
CPPUNIT_ASSERT(re_match(s_regex, s2.toString().c_str()));
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(SequenceTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (SequenceTest);
}
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: SequenceTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::SequenceTest::suite()->getTests();
+ unsigned int prefix_len = libdap::SequenceTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -440,9 +458,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::SequenceTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::SequenceTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/ServerFunctionsListUnitTest.cc b/unit-tests/ServerFunctionsListUnitTest.cc
index 098c0f6..02f03fb 100644
--- a/unit-tests/ServerFunctionsListUnitTest.cc
+++ b/unit-tests/ServerFunctionsListUnitTest.cc
@@ -40,18 +40,17 @@
#include "ServerFunction.h"
#include "ServerFunctionsList.h"
+using namespace CppUnit;
+
static bool debug = false;
#undef DBG
#define DBG(x) do { if (debug) (x); } while(false);
-
void sflut(int, libdap::BaseType *[], libdap::DDS &, libdap::BaseType **btpp)
{
- string info = string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
- + "<function name=\"ugr4\" version=\"0.1\">\n"
- + "ServeFunctionsList Unit Test.\n" + "usage: sflut()"
- + "\n"+"</function>";
+ string info = string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") + "<function name=\"ugr4\" version=\"0.1\">\n"
+ + "ServeFunctionsList Unit Test.\n" + "usage: sflut()" + "\n" + "</function>";
libdap::Str *response = new libdap::Str("info");
response->set_value(info);
@@ -60,9 +59,10 @@ void sflut(int, libdap::BaseType *[], libdap::DDS &, libdap::BaseType **btpp)
}
-class SFLUT : public libdap::ServerFunction {
-public :
- SFLUT() {
+class SFLUT: public libdap::ServerFunction {
+public:
+ SFLUT()
+ {
setName("sflut");
setDescriptionString("This is a unit test to test the ServerFunctionList class.");
setUsageString("sflut()");
@@ -74,64 +74,71 @@ public :
}
};
-
namespace libdap {
class ServerFunctionsListUnitTest: public CppUnit::TestFixture {
public:
// Called once before everything gets tested
- ServerFunctionsListUnitTest() {
+ ServerFunctionsListUnitTest()
+ {
// DBG(cerr << " BindTest - Constructor" << endl);
}
// Called at the end of the test
- ~ServerFunctionsListUnitTest() {
- // DBG(cerr << " BindTest - Destructor" << endl);
+ ~ServerFunctionsListUnitTest()
+ {
+ // DBG(cerr << " BindTest - Destructor" << endl);
}
// Called before each test
- void setup() {
+ void setup()
+ {
// DBG(cerr << " BindTest - setup()" << endl);
}
// Called after each test
- void tearDown() {
+ void tearDown()
+ {
// DBG(cerr << " tearDown()" << endl);
}
- CPPUNIT_TEST_SUITE( libdap::ServerFunctionsListUnitTest );
+ CPPUNIT_TEST_SUITE (libdap::ServerFunctionsListUnitTest);
- CPPUNIT_TEST(sflut_test);
+ CPPUNIT_TEST (sflut_test);
//CPPUNIT_TEST(always_pass);
CPPUNIT_TEST_SUITE_END();
- void printFunctionNames(){
+ void printFunctionNames()
+ {
vector<string> *names = new vector<string>();
printFunctionNames(names);
delete names;
}
-
- void printFunctionNames(vector<string> *names){
- DBG(cerr << "Server_Function_List_Unit_Test::printFunctionNames() - ServerFunctionList::getFunctionNames(): " << endl);
- if(names->empty()){
+ void printFunctionNames(vector<string> *names)
+ {
+ DBG(
+ cerr << "Server_Function_List_Unit_Test::printFunctionNames() - ServerFunctionList::getFunctionNames(): "
+ << endl);
+ if (names->empty()) {
DBG(cerr << " Function list is empty." << endl);
return;
}
- for(size_t i=0; i<names->size() ;i++){
- DBG(cerr << " name["<< i << "]: "<< (*names)[i] << endl);
+ for (size_t i = 0; i < names->size(); i++) {
+ DBG(cerr << " name[" << i << "]: " << (*names)[i] << endl);
}
}
- void always_pass(){
+ void always_pass()
+ {
CPPUNIT_ASSERT(true);
}
-
- void sflut_test(){
+ void sflut_test()
+ {
DBG(cerr << endl);
SFLUT *ssf = new SFLUT();
@@ -141,8 +148,7 @@ public:
libdap::ServerFunctionsList::TheList()->getFunctionNames(&names);
printFunctionNames(&names);
- CPPUNIT_ASSERT(names.size()==0);
-
+ CPPUNIT_ASSERT(names.size() == 0);
DBG(cerr << "ServerFunctionsListUnitTest::sflut_test() - Adding function(): " << ssf->getName() << endl);
libdap::ServerFunctionsList::TheList()->add_function(ssf);
@@ -150,7 +156,7 @@ public:
names.clear();
libdap::ServerFunctionsList::TheList()->getFunctionNames(&names);
printFunctionNames(&names);
- CPPUNIT_ASSERT(names.size()==1);
+ CPPUNIT_ASSERT(names.size() == 1);
#if 0
DBG(cerr << "ServerFunctionsListUnitTest::sflut_test() - Deleting the List." << endl);
@@ -175,24 +181,33 @@ public:
// BindTest
-CPPUNIT_TEST_SUITE_REGISTRATION(libdap::ServerFunctionsListUnitTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (libdap::ServerFunctionsListUnitTest);
-
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: ServerFunctionsListUnitTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::ServerFunctionsListUnitTest::suite()->getTests();
+ unsigned int prefix_len = libdap::ServerFunctionsListUnitTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -201,9 +216,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::ServerFunctionsListUnitTest::") + argv[i++];
-
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::ServerFunctionsListUnitTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/SignalHandlerTest.cc b/unit-tests/SignalHandlerTest.cc
index bf03501..8083c6f 100644
--- a/unit-tests/SignalHandlerTest.cc
+++ b/unit-tests/SignalHandlerTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -47,31 +46,37 @@ static bool debug = false;
#undef DBG
#define DBG(x) do { if (debug) (x); } while(false);
-namespace libdap
-{
+namespace libdap {
/** Test Handler. This is used with the SignalHandlerTest unit tests. */
-class TestHandler : public EventHandler
-{
+class TestHandler: public EventHandler {
public:
int flag;
- TestHandler() : flag(0) {}
+ TestHandler() :
+ flag(0)
+ {
+ }
- virtual void handle_signal(int signum) {
+ virtual void handle_signal(int signum)
+ {
DBG(cerr << "signal number " << signum << " received" << endl);
flag = 1;
}
};
-class SignalHandlerTest : public TestFixture {
+class SignalHandlerTest: public TestFixture {
private:
SignalHandler *sh;
TestHandler *th;
public:
- SignalHandlerTest() {}
- ~SignalHandlerTest() {}
+ SignalHandlerTest()
+ {
+ }
+ ~SignalHandlerTest()
+ {
+ }
void setUp()
{
@@ -115,24 +120,22 @@ public:
CPPUNIT_ASSERT(th->flag == 1);
}
- CPPUNIT_TEST_SUITE( SignalHandlerTest );
+ CPPUNIT_TEST_SUITE (SignalHandlerTest);
- CPPUNIT_TEST(register_handler_test);
- CPPUNIT_TEST(remove_handler_test);
- CPPUNIT_TEST(alarm_test);
+ CPPUNIT_TEST (register_handler_test);
+ CPPUNIT_TEST (remove_handler_test);
+ CPPUNIT_TEST (alarm_test);
CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(SignalHandlerTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (SignalHandlerTest);
}
-int main(int argc, char*argv[]) {
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+int main(int argc, char*argv[])
+{
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
@@ -140,10 +143,22 @@ int main(int argc, char*argv[]) {
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: SignalHandlerTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = libdap::SignalHandlerTest::suite()->getTests();
+ unsigned int prefix_len = libdap::SignalHandlerTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -152,9 +167,9 @@ int main(int argc, char*argv[]) {
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::SignalHandlerTest::") + argv[i++];
- DBG(cerr << "Running " << test << endl);
+ for ( ; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = libdap::SignalHandlerTest::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/ancT.cc b/unit-tests/ancT.cc
index 1db225f..f00a63b 100644
--- a/unit-tests/ancT.cc
+++ b/unit-tests/ancT.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -22,7 +21,7 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
-
+
#include <cppunit/TextTestRunner.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/extensions/HelperMacros.h>
@@ -40,7 +39,7 @@
#include <string>
#include <sstream>
-//#define DODS_DEBUG
+#include "GetOpt.h"
#include "Ancillary.h"
@@ -51,60 +50,113 @@ using namespace CppUnit;
using namespace std;
using namespace libdap;
-class ancT : public TestFixture {
+static bool debug = false;
+
+class ancT: public TestFixture {
private:
protected:
public:
- ancT() {}
- ~ancT() {}
-
- void setUp () {}
+ ancT()
+ {
+ }
+ ~ancT()
+ {
+ }
+
+ void setUp()
+ {
+ }
- void tearDown() {}
+ void tearDown()
+ {
+ }
- CPPUNIT_TEST_SUITE( ancT );
+ CPPUNIT_TEST_SUITE (ancT);
- CPPUNIT_TEST(find_ancillary_file_test);
- CPPUNIT_TEST(find_group_ancillary_file_test);
+ CPPUNIT_TEST (find_ancillary_file_test);
+ CPPUNIT_TEST (find_group_ancillary_file_test);
CPPUNIT_TEST_SUITE_END();
- void find_ancillary_file_test() {
- CPPUNIT_ASSERT(Ancillary::find_ancillary_file((string)TEST_SRC_DIR + "/das-testsuite/test.1", "das", "", "")
- == (string)TEST_SRC_DIR + "/das-testsuite/test.1.das");
- CPPUNIT_ASSERT(Ancillary::find_ancillary_file((string)TEST_SRC_DIR + "/das-testsuite/special.test.hdf", "das", "", "")
- == (string)TEST_SRC_DIR + "/das-testsuite/special.test.das");
- CPPUNIT_ASSERT(Ancillary::find_ancillary_file((string)TEST_SRC_DIR + "/das-testsuite/test.2", "das", "", "")
- == (string)TEST_SRC_DIR + "/das-testsuite/das");
- CPPUNIT_ASSERT(Ancillary::find_ancillary_file((string)TEST_SRC_DIR + "/das-testsuite/test.1.gz", "das", "", "")
- == (string)TEST_SRC_DIR + "/das-testsuite/test.1.das");
- CPPUNIT_ASSERT(Ancillary::find_ancillary_file((string)TEST_SRC_DIR + "/das-testsuite/test.3.Z", "das", "", "")
- == (string)TEST_SRC_DIR + "/das-testsuite/test.3.Z.das");
+ void find_ancillary_file_test()
+ {
+ CPPUNIT_ASSERT(
+ Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/test.1", "das", "", "")
+ == (string) TEST_SRC_DIR + "/das-testsuite/test.1.das");
+ CPPUNIT_ASSERT(
+ Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/special.test.hdf", "das", "", "")
+ == (string) TEST_SRC_DIR + "/das-testsuite/special.test.das");
+ CPPUNIT_ASSERT(
+ Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/test.2", "das", "", "")
+ == (string) TEST_SRC_DIR + "/das-testsuite/das");
+ CPPUNIT_ASSERT(
+ Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/test.1.gz", "das", "", "")
+ == (string) TEST_SRC_DIR + "/das-testsuite/test.1.das");
+ CPPUNIT_ASSERT(
+ Ancillary::find_ancillary_file((string) TEST_SRC_DIR + "/das-testsuite/test.3.Z", "das", "", "")
+ == (string) TEST_SRC_DIR + "/das-testsuite/test.3.Z.das");
}
-
- void find_group_ancillary_file_test() {
- CPPUNIT_ASSERT(Ancillary::find_group_ancillary_file((string)TEST_SRC_DIR + "/cgi-util-tests/02group.hdf", ".htm")
- == (string)TEST_SRC_DIR + "/cgi-util-tests/group.htm");
- CPPUNIT_ASSERT(Ancillary::find_group_ancillary_file((string)TEST_SRC_DIR + "/cgi-util-tests/group01.hdf", ".htm")
- == (string)TEST_SRC_DIR + "/cgi-util-tests/group.htm");
- CPPUNIT_ASSERT(Ancillary::find_group_ancillary_file((string)TEST_SRC_DIR + "/cgi-util-tests/group.hdf", ".htm")
- == "");
+
+ void find_group_ancillary_file_test()
+ {
+ CPPUNIT_ASSERT(
+ Ancillary::find_group_ancillary_file((string) TEST_SRC_DIR + "/cgi-util-tests/02group.hdf", ".htm")
+ == (string) TEST_SRC_DIR + "/cgi-util-tests/group.htm");
+ CPPUNIT_ASSERT(
+ Ancillary::find_group_ancillary_file((string) TEST_SRC_DIR + "/cgi-util-tests/group01.hdf", ".htm")
+ == (string) TEST_SRC_DIR + "/cgi-util-tests/group.htm");
+ CPPUNIT_ASSERT(
+ Ancillary::find_group_ancillary_file((string) TEST_SRC_DIR + "/cgi-util-tests/group.hdf", ".htm") == "");
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(ancT);
+CPPUNIT_TEST_SUITE_REGISTRATION (ancT);
-int
-main( int, char** )
+int main(int argc, char *argv[])
{
- CppUnit::TextTestRunner runner;
- runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: ancT has the following tests:" << endl;
+ const std::vector<Test*> &tests = ancT::suite()->getTests();
+ unsigned int prefix_len = ancT::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
- bool wasSuccessful = runner.run( "", false ) ;
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = ancT::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
-
diff --git a/unit-tests/arrayT.cc b/unit-tests/arrayT.cc
index a18d763..b6a8bc1 100644
--- a/unit-tests/arrayT.cc
+++ b/unit-tests/arrayT.cc
@@ -1,4 +1,3 @@
-
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -14,17 +13,23 @@
#include "util.h"
#include "debug.h"
-using std::cerr ;
-using std::endl ;
+#include "GetOpt.h"
+
+using std::cerr;
+using std::endl;
+
+using namespace CppUnit;
int test_variable_sleep_interval = 0; // Used in Test* classes for testing
- // timeouts.
+// timeouts.
+
+static bool debug = false;
-class arrayT : public CppUnit::TestFixture {
+class arrayT: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE( arrayT ) ;
-CPPUNIT_TEST( arrayT_test ) ;
-CPPUNIT_TEST_SUITE_END( ) ;
+CPPUNIT_TEST_SUITE (arrayT);
+ CPPUNIT_TEST(arrayT_test);CPPUNIT_TEST_SUITE_END( )
+ ;
private:
/* TEST PRIVATE DATA */
@@ -38,157 +43,174 @@ public:
void tearDown()
{
- delete factory; factory = 0;
+ delete factory;
+ factory = 0;
}
void arrayT_test()
{
- BaseType *bt = factory->NewInt16() ;
-
- TestArray ar( "My Array", bt ) ;
-
- int l = ar.length() ;
- CPPUNIT_ASSERT( l == -1 ) ;
-
- try
- {
- int w = ar.width(true) ;
- DBG(cerr << "w = " << w << endl);
- DBG(cerr << "(int)bt->width() " << (int)bt->width() << endl);
- DBG(cerr << "L " << l << endl);
- CPPUNIT_ASSERT( w == ( l * (int)bt->width() ) ) ;
- }
- catch( InternalErr &e )
- {
- CPPUNIT_FAIL( "Unable to retrieve width" ) ;
- }
-
- ar.append_dim( 4, "dim1" ) ;
-
- l = ar.length() ;
- CPPUNIT_ASSERT( l == 4 ) ;
-
- try
- {
- int w = ar.width() ;
- CPPUNIT_ASSERT( w == ( l * (int)bt->width() ) ) ;
- }
- catch( InternalErr &e )
- {
- CPPUNIT_FAIL( "Unable to retrieve width" ) ;
- }
-
- ar.append_dim( 3, "dim2" ) ;
-
- l = ar.length() ;
- CPPUNIT_ASSERT( l == 12 ) ;
-
- try
- {
- int w = ar.width() ;
- CPPUNIT_ASSERT( w == ( l * (int)bt->width() ) ) ;
- }
- catch( InternalErr &e )
- {
- CPPUNIT_FAIL( "Unable to retrieve width" ) ;
- }
-
- ar.append_dim( 2, "dim3" ) ;
-
- l = ar.length() ;
- CPPUNIT_ASSERT( l == 24 ) ;
-
- try
- {
- int w = ar.width() ;
- CPPUNIT_ASSERT( w == ( l * (int)bt->width() ) ) ;
- }
- catch( InternalErr &e )
- {
- CPPUNIT_FAIL( "Unable to retrieve width" ) ;
- }
-
- vector<string> dims ;
- typedef vector<string>::const_iterator citer ;
- dims.push_back( "dim1" ) ;
- dims.push_back( "dim2" ) ;
- dims.push_back( "dim3" ) ;
-
- vector<int> dimsize ;
- typedef vector<int>::const_iterator dsiter ;
- dimsize.push_back( 4 ) ;
- dimsize.push_back( 3 ) ;
- dimsize.push_back( 2 ) ;
-
- citer i = dims.begin() ;
- dsiter d = dimsize.begin() ;
- Array::Dim_iter diter = ar.dim_begin() ;
- i = dims.begin() ;
- d = dimsize.begin() ;
- for( ; diter != ar.dim_end() && i != dims.end(); diter++, i++, d++ )
- {
- CPPUNIT_ASSERT( ar.dimension_name( diter ) == (*i) ) ;
- if( ar.dimension_name( diter ) == (*i) )
- {
- CPPUNIT_ASSERT( ar.dimension_size( diter ) == (*d) ) ;
- CPPUNIT_ASSERT( ar.dimension_start( diter ) == 0 ) ;
- CPPUNIT_ASSERT( ar.dimension_stop( diter ) == (*d)-1 ) ;
- CPPUNIT_ASSERT( ar.dimension_stride( diter ) == 1 ) ;
- }
- }
- if( diter != ar.dim_end() && i == dims.end() )
- {
- CPPUNIT_FAIL( "too many dimensions" ) ;
- }
- else if( diter == ar.dim_end() && i != dims.end() )
- {
- CPPUNIT_FAIL( "not enough dimensions" ) ;
- }
-
- unsigned int numdims = ar.dimensions( ) ;
- CPPUNIT_ASSERT( numdims == 3 ) ;
-
- diter = ar.dim_begin() ;
- ar.add_constraint( diter, 0, 2, 3 ) ;
-
- l = ar.length() ;
- CPPUNIT_ASSERT( l == 12 ) ;
-
- diter = ar.dim_begin() ;
- diter++ ;
- ar.add_constraint( diter, 0, 2, 2 ) ;
-
- l = ar.length() ;
- CPPUNIT_ASSERT( l == 8 ) ;
-
- ar.reset_constraint() ;
-
- l = ar.length() ;
- CPPUNIT_ASSERT( l == 24 ) ;
-
- bool is_read = ar.read() ;
- CPPUNIT_ASSERT( is_read == true ) ;
-
- cout << ar << endl ;
-
- /* ar.print_val( stdout ) ; */
-
- delete bt ;
+ BaseType *bt = factory->NewInt16();
+
+ TestArray ar("My Array", bt);
+
+ int l = ar.length();
+ CPPUNIT_ASSERT(l == -1);
+
+ try {
+ int w = ar.width(true);
+ DBG(cerr << "w = " << w << endl);DBG(cerr << "(int)bt->width() " << (int)bt->width() << endl);DBG(cerr << "L " << l << endl);
+ CPPUNIT_ASSERT(w == (l * (int ) bt->width()));
+ }
+ catch (InternalErr &e) {
+ CPPUNIT_FAIL("Unable to retrieve width");
+ }
+
+ ar.append_dim(4, "dim1");
+
+ l = ar.length();
+ CPPUNIT_ASSERT(l == 4);
+
+ try {
+ int w = ar.width();
+ CPPUNIT_ASSERT(w == (l * (int ) bt->width()));
+ }
+ catch (InternalErr &e) {
+ CPPUNIT_FAIL("Unable to retrieve width");
+ }
+
+ ar.append_dim(3, "dim2");
+
+ l = ar.length();
+ CPPUNIT_ASSERT(l == 12);
+
+ try {
+ int w = ar.width();
+ CPPUNIT_ASSERT(w == (l * (int ) bt->width()));
+ }
+ catch (InternalErr &e) {
+ CPPUNIT_FAIL("Unable to retrieve width");
+ }
+
+ ar.append_dim(2, "dim3");
+
+ l = ar.length();
+ CPPUNIT_ASSERT(l == 24);
+
+ try {
+ int w = ar.width();
+ CPPUNIT_ASSERT(w == (l * (int ) bt->width()));
+ }
+ catch (InternalErr &e) {
+ CPPUNIT_FAIL("Unable to retrieve width");
+ }
+
+ vector<string> dims;
+ typedef vector<string>::const_iterator citer;
+ dims.push_back("dim1");
+ dims.push_back("dim2");
+ dims.push_back("dim3");
+
+ vector<int> dimsize;
+ typedef vector<int>::const_iterator dsiter;
+ dimsize.push_back(4);
+ dimsize.push_back(3);
+ dimsize.push_back(2);
+
+ citer i = dims.begin();
+ dsiter d = dimsize.begin();
+ Array::Dim_iter diter = ar.dim_begin();
+ i = dims.begin();
+ d = dimsize.begin();
+ for (; diter != ar.dim_end() && i != dims.end(); diter++, i++, d++) {
+ CPPUNIT_ASSERT(ar.dimension_name(diter) == (*i));
+ if (ar.dimension_name(diter) == (*i)) {
+ CPPUNIT_ASSERT(ar.dimension_size(diter) == (*d));
+ CPPUNIT_ASSERT(ar.dimension_start(diter) == 0);
+ CPPUNIT_ASSERT(ar.dimension_stop(diter) == (*d) - 1);
+ CPPUNIT_ASSERT(ar.dimension_stride(diter) == 1);
+ }
+ }
+ if (diter != ar.dim_end() && i == dims.end()) {
+ CPPUNIT_FAIL("too many dimensions");
+ }
+ else if (diter == ar.dim_end() && i != dims.end()) {
+ CPPUNIT_FAIL("not enough dimensions");
+ }
+
+ unsigned int numdims = ar.dimensions();
+ CPPUNIT_ASSERT(numdims == 3);
+
+ diter = ar.dim_begin();
+ ar.add_constraint(diter, 0, 2, 3);
+
+ l = ar.length();
+ CPPUNIT_ASSERT(l == 12);
+
+ diter = ar.dim_begin();
+ diter++;
+ ar.add_constraint(diter, 0, 2, 2);
+
+ l = ar.length();
+ CPPUNIT_ASSERT(l == 8);
+
+ ar.reset_constraint();
+
+ l = ar.length();
+ CPPUNIT_ASSERT(l == 24);
+
+ bool is_read = ar.read();
+ CPPUNIT_ASSERT(is_read == true);
+
+ cout << ar << endl;
+
+ delete bt;
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( arrayT ) ;
+CPPUNIT_TEST_SUITE_REGISTRATION(arrayT);
-int main(int, char **)
+int main(int argc, char *argv[])
{
- CppUnit::TextUi::TestRunner runner ;
- CppUnit::TestFactoryRegistry ®istry =
- CppUnit::TestFactoryRegistry::getRegistry() ;
- runner.addTest( registry.makeTest() ) ;
- runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(
- &runner.result(),
- std::cerr ) );
- bool wasSuccessful = runner.run( "", false ) ;
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: arrayT has the following tests:" << endl;
+ const std::vector<Test*> &tests = arrayT::suite()->getTests();
+ unsigned int prefix_len = arrayT::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = arrayT::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+
return wasSuccessful ? 0 : 1;
}
-
diff --git a/unit-tests/attrTableT.cc b/unit-tests/attrTableT.cc
index d322cd4..5908564 100644
--- a/unit-tests/attrTableT.cc
+++ b/unit-tests/attrTableT.cc
@@ -1,4 +1,3 @@
-
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -9,22 +8,25 @@
#include <iostream>
#include <vector>
#include "AttrTable.h"
-//#include "Pix.h"
+#include "GetOpt.h"
-using std::cerr ;
-using std::endl ;
-using std::vector ;
+using std::cerr;
+using std::endl;
+using std::vector;
-using namespace libdap ;
+using namespace CppUnit;
+using namespace libdap;
int test_variable_sleep_interval = 0; // Used in Test* classes for testing
- // timeouts.
+// timeouts.
+
+static bool debug = false;
-class attrTableT : public CppUnit::TestFixture {
+class attrTableT: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE( attrTableT ) ;
-CPPUNIT_TEST( attrTableT_test ) ;
-CPPUNIT_TEST_SUITE_END( ) ;
+CPPUNIT_TEST_SUITE (attrTableT);
+ CPPUNIT_TEST(attrTableT_test);CPPUNIT_TEST_SUITE_END( )
+ ;
private:
/* TEST PRIVATE DATA */
@@ -34,285 +36,295 @@ public:
{
}
- void tearDown()
+ void tearDown()
{
}
void attrTableT_test()
{
- AttrTable at ;
-
- unsigned int at_size = at.get_size() ;
- CPPUNIT_ASSERT( at_size == 0 ) ;
-
- string at_name = at.get_name() ;
- CPPUNIT_ASSERT( at_name == "" ) ;
-
- at.set_name( "My Attributes" ) ;
- at_name = at.get_name() ;
- CPPUNIT_ASSERT( at_name == "My Attributes" ) ;
-
- AttrTable *container = at.find_container( "dummy_container" ) ;
- CPPUNIT_ASSERT( !container ) ;
-
- AttrTable *dummy_at = 0 ;
-
- AttrTable::Attr_iter iter ;
- at.find( "dummy_attr", &dummy_at, &iter ) ;
- CPPUNIT_ASSERT( iter == at.attr_end() ) ;
-
- string attr_name = "attr1" ;
- string attr_type = "string" ;
- string attr_value = "attr1Value1" ;
- at.append_attr( attr_name, attr_type, attr_value ) ;
-
- attr_name = "attr2" ;
- attr_type = "string" ;
- attr_value = "attr2Value1" ;
- at.append_attr( attr_name, attr_type, attr_value ) ;
-
- attr_name = "attr3" ;
- attr_type = "string" ;
- attr_value = "attr3Value1" ;
- at.append_attr( attr_name, attr_type, attr_value ) ;
-
- at.append_attr( "attr4", "string", "attr4Value1" ) ;
-
- at_size = at.get_size() ;
- CPPUNIT_ASSERT( at_size == 4 ) ;
-
- //at.print( stdout ) ;
- iter = at.attr_end() ;
- at.find( "attr3", &dummy_at, &iter ) ;
- CPPUNIT_ASSERT( iter != at.attr_end() ) ;
-
- iter = at.attr_end() ;
- at.find( "dummy_attr", &dummy_at, &iter ) ;
- CPPUNIT_ASSERT( iter == at.attr_end() ) ;
-
- attr_type = at.get_type( "attr3" ) ;
- CPPUNIT_ASSERT( attr_type == "String" ) ;
-
- AttrType attr_type_enum = at.get_attr_type( "attr3" ) ;
- CPPUNIT_ASSERT( attr_type_enum == Attr_string ) ;
-
- unsigned int num_attrs = at.get_attr_num( "attr3" ) ;
- CPPUNIT_ASSERT( num_attrs == 1 ) ;
-
- attr_value = at.get_attr( "attr3" ) ;
- CPPUNIT_ASSERT( attr_value == "attr3Value1" ) ;
-
- at.append_attr( "attr3", "string", "attr3Value2" ) ;
- at.append_attr( "attr3", "string", "attr3Value3" ) ;
- at.append_attr( "attr3", "string", "attr3Value4" ) ;
-
- attr_value = at.get_attr( "attr3" ) ;
- CPPUNIT_ASSERT( attr_value == "attr3Value1" ) ;
-
- vector<string> sb ;
- sb.push_back( "attr3Value1" ) ;
- sb.push_back( "attr3Value2" ) ;
- sb.push_back( "attr3Value3" ) ;
- sb.push_back( "attr3Value4" ) ;
-
- typedef vector<string>::const_iterator str_citer ;
- typedef vector<string>::iterator str_iter ;
-
- vector<string> *values = at.get_attr_vector( "attr3" ) ;
- CPPUNIT_ASSERT( values ) ;
- if( values )
- {
- str_citer vi = values->begin() ;
- str_citer sbi = sb.begin() ;
- for( ; vi != values->end() && sbi != sb.end(); vi++, sbi++ )
- {
- CPPUNIT_ASSERT( (*vi) == (*sbi) ) ;
- }
- CPPUNIT_ASSERT( vi == values->end() && sbi == sb.end() ) ;
- if( vi == values->end() && sbi != sb.end() )
- {
- CPPUNIT_FAIL( "not enough values" ) ;
- }
- else if( vi != values->end() && sbi == sb.end() )
- {
- CPPUNIT_FAIL( "too many values" ) ;
- }
- }
-
- vector<string> attrs ;
- attrs.push_back( "attr1" ) ;
- attrs.push_back( "attr2" ) ;
- attrs.push_back( "attr3" ) ;
- attrs.push_back( "attr4" ) ;
-
- str_citer ai = attrs.begin() ;
- AttrTable::Attr_iter i = at.attr_begin() ;
- // ai = attrs.begin() ;
- for( ; i != at.attr_end() && ai != attrs.end(); i++, ai++ )
- {
- CPPUNIT_ASSERT( (*i)->name == (*ai) ) ;
- }
- CPPUNIT_ASSERT( i == at.attr_end() && ai == attrs.end() ) ;
- if( i != at.attr_end() && ai == attrs.end() )
- {
- CPPUNIT_FAIL( "too many attributes" ) ;
- }
- else if( i == at.attr_end() && ai != attrs.end() )
- {
- CPPUNIT_FAIL( "not enough attributes" ) ;
- }
-
- iter = at.attr_end() ;
- at.find( "attr3", &dummy_at, &iter ) ;
- CPPUNIT_ASSERT( iter != at.attr_end() ) ;
-
- attr_name = at.get_name( iter ) ;
- CPPUNIT_ASSERT( attr_name == "attr3" ) ;
-
- bool isit = at.is_container( iter ) ;
- CPPUNIT_ASSERT( isit == false ) ;
-
- dummy_at = at.get_attr_table( iter ) ;
- CPPUNIT_ASSERT( !dummy_at ) ;
-
- attr_type = at.get_type( iter ) ;
- CPPUNIT_ASSERT( attr_type == "String" ) ;
-
- attr_type_enum = at.get_attr_type( iter ) ;
- CPPUNIT_ASSERT( attr_type_enum == Attr_string ) ;
-
- attr_value = at.get_attr( iter ) ;
- CPPUNIT_ASSERT( attr_value == "attr3Value1" ) ;
-
- attr_value = at.get_attr( iter, 1 ) ;
- CPPUNIT_ASSERT( attr_value == "attr3Value2" ) ;
-
- values = at.get_attr_vector( iter ) ;
- CPPUNIT_ASSERT( values ) ;
- if( values )
- {
- str_citer vi = values->begin() ;
- str_citer sbi = sb.begin() ;
- for( ; vi != values->end() && sbi != sb.end(); vi++, sbi++ )
- {
- CPPUNIT_ASSERT( (*vi) == (*sbi) ) ;
- }
- CPPUNIT_ASSERT( vi == values->end() && sbi == sb.end() ) ;
- if( vi == values->end() && sbi != sb.end() )
- {
- CPPUNIT_FAIL( "not enough values" ) ;
- }
- else if( vi != values->end() && sbi == sb.end() )
- {
- CPPUNIT_FAIL( "too many values" ) ;
- }
- }
-
-
- {
- str_iter sbi = sb.begin() ;
- sbi++ ;
- sb.erase( sbi ) ;
- }
-
- at.del_attr( "attr3", 1 ) ;
- values = at.get_attr_vector( iter ) ;
- CPPUNIT_ASSERT( values ) ;
- if( values )
- {
- str_citer vi = values->begin() ;
- str_citer sbi = sb.begin() ;
- for( ; vi != values->end() && sbi != sb.end(); vi++, sbi++ )
- {
- CPPUNIT_ASSERT( (*vi) == (*sbi) ) ;
- }
- CPPUNIT_ASSERT( vi == values->end() && sbi == sb.end() ) ;
- if( vi == values->end() && sbi != sb.end() )
- {
- CPPUNIT_FAIL( "not enough values" ) ;
- }
- else if( vi != values->end() && sbi == sb.end() )
- {
- CPPUNIT_FAIL( "too many values" ) ;
- }
- }
-
- at.del_attr( "attr3" ) ;
- container = 0 ;
- try
- {
- container = at.append_container( "attr2" ) ;
- CPPUNIT_FAIL( "added container named attr2 successfully - already exists" ) ;
- }
- catch( Error &e )
- {
- }
- CPPUNIT_ASSERT( !container ) ;
-
- try
- {
- container = at.append_container( "attr5" ) ;
- }
- catch( Error &e )
- {
- CPPUNIT_FAIL( "failed to add new container attr5" ) ;
- }
- CPPUNIT_ASSERT( container ) ;
- if( container )
- {
- CPPUNIT_ASSERT( container->get_name() == "attr5" ) ;
- }
-
- container = at.find_container( "attr5" ) ;
- CPPUNIT_ASSERT( container ) ;
- if( container )
- {
- string container_name = container->get_name() ;
- CPPUNIT_ASSERT( container_name == "attr5" ) ;
- }
-
- iter = at.attr_end() ;
- at.find( "attr5", &dummy_at, &iter ) ;
- CPPUNIT_ASSERT( iter != at.attr_end() ) ;
- attr_name = at.get_name( iter ) ;
- CPPUNIT_ASSERT( attr_name == "attr5" ) ;
- isit = at.is_container( iter ) ;
- CPPUNIT_ASSERT( isit == true ) ;
- container = at.get_attr_table( iter ) ;
- CPPUNIT_ASSERT( container ) ;
- attr_type = at.get_type( iter ) ;
- CPPUNIT_ASSERT( attr_type == "Container" ) ;
- attr_type_enum = at.get_attr_type( iter ) ;
- CPPUNIT_ASSERT( attr_type_enum == Attr_container ) ;
-
- /* FIX: does append attr return anything? */
- container->append_attr( "attr5-1", "string", "attr5.1Value1" ) ;
- container->append_attr( "attr5-2", "string", "attr5.2Value1" ) ;
- container->append_attr( "attr5-3", "string", "attr5.3Value1" ) ;
- container->append_attr( "attr5-4", "string", "attr5.4Value1" ) ;
- iter = at.attr_end() ;
- at.find( "attr5.attr5-3", &dummy_at, &iter ) ;
- CPPUNIT_ASSERT( iter != at.attr_end() ) ;
- CPPUNIT_ASSERT( container == dummy_at ) ;
-
- //at.print( stdout ) ;
+ AttrTable at;
+
+ unsigned int at_size = at.get_size();
+ CPPUNIT_ASSERT(at_size == 0);
+
+ string at_name = at.get_name();
+ CPPUNIT_ASSERT(at_name == "");
+
+ at.set_name("My Attributes");
+ at_name = at.get_name();
+ CPPUNIT_ASSERT(at_name == "My Attributes");
+
+ AttrTable *container = at.find_container("dummy_container");
+ CPPUNIT_ASSERT(!container);
+
+ AttrTable *dummy_at = 0;
+
+ AttrTable::Attr_iter iter;
+ at.find("dummy_attr", &dummy_at, &iter);
+ CPPUNIT_ASSERT(iter == at.attr_end());
+
+ string attr_name = "attr1";
+ string attr_type = "string";
+ string attr_value = "attr1Value1";
+ at.append_attr(attr_name, attr_type, attr_value);
+
+ attr_name = "attr2";
+ attr_type = "string";
+ attr_value = "attr2Value1";
+ at.append_attr(attr_name, attr_type, attr_value);
+
+ attr_name = "attr3";
+ attr_type = "string";
+ attr_value = "attr3Value1";
+ at.append_attr(attr_name, attr_type, attr_value);
+
+ at.append_attr("attr4", "string", "attr4Value1");
+
+ at_size = at.get_size();
+ CPPUNIT_ASSERT(at_size == 4);
+
+ //at.print( stdout ) ;
+ iter = at.attr_end();
+ at.find("attr3", &dummy_at, &iter);
+ CPPUNIT_ASSERT(iter != at.attr_end());
+
+ iter = at.attr_end();
+ at.find("dummy_attr", &dummy_at, &iter);
+ CPPUNIT_ASSERT(iter == at.attr_end());
+
+ attr_type = at.get_type("attr3");
+ CPPUNIT_ASSERT(attr_type == "String");
+
+ AttrType attr_type_enum = at.get_attr_type("attr3");
+ CPPUNIT_ASSERT(attr_type_enum == Attr_string);
+
+ unsigned int num_attrs = at.get_attr_num("attr3");
+ CPPUNIT_ASSERT(num_attrs == 1);
+
+ attr_value = at.get_attr("attr3");
+ CPPUNIT_ASSERT(attr_value == "attr3Value1");
+
+ at.append_attr("attr3", "string", "attr3Value2");
+ at.append_attr("attr3", "string", "attr3Value3");
+ at.append_attr("attr3", "string", "attr3Value4");
+
+ attr_value = at.get_attr("attr3");
+ CPPUNIT_ASSERT(attr_value == "attr3Value1");
+
+ vector<string> sb;
+ sb.push_back("attr3Value1");
+ sb.push_back("attr3Value2");
+ sb.push_back("attr3Value3");
+ sb.push_back("attr3Value4");
+
+ typedef vector<string>::const_iterator str_citer;
+ typedef vector<string>::iterator str_iter;
+
+ vector<string> *values = at.get_attr_vector("attr3");
+ CPPUNIT_ASSERT(values);
+ if (values) {
+ str_citer vi = values->begin();
+ str_citer sbi = sb.begin();
+ for (; vi != values->end() && sbi != sb.end(); vi++, sbi++) {
+ CPPUNIT_ASSERT((*vi) == (*sbi));
+ }
+ CPPUNIT_ASSERT(vi == values->end() && sbi == sb.end());
+ if (vi == values->end() && sbi != sb.end()) {
+ CPPUNIT_FAIL("not enough values");
+ }
+ else if (vi != values->end() && sbi == sb.end()) {
+ CPPUNIT_FAIL("too many values");
+ }
+ }
+
+ vector<string> attrs;
+ attrs.push_back("attr1");
+ attrs.push_back("attr2");
+ attrs.push_back("attr3");
+ attrs.push_back("attr4");
+
+ str_citer ai = attrs.begin();
+ AttrTable::Attr_iter i = at.attr_begin();
+ // ai = attrs.begin() ;
+ for (; i != at.attr_end() && ai != attrs.end(); i++, ai++) {
+ CPPUNIT_ASSERT((*i)->name == (*ai));
+ }
+ CPPUNIT_ASSERT(i == at.attr_end() && ai == attrs.end());
+ if (i != at.attr_end() && ai == attrs.end()) {
+ CPPUNIT_FAIL("too many attributes");
+ }
+ else if (i == at.attr_end() && ai != attrs.end()) {
+ CPPUNIT_FAIL("not enough attributes");
+ }
+
+ iter = at.attr_end();
+ at.find("attr3", &dummy_at, &iter);
+ CPPUNIT_ASSERT(iter != at.attr_end());
+
+ attr_name = at.get_name(iter);
+ CPPUNIT_ASSERT(attr_name == "attr3");
+
+ bool isit = at.is_container(iter);
+ CPPUNIT_ASSERT(isit == false);
+
+ dummy_at = at.get_attr_table(iter);
+ CPPUNIT_ASSERT(!dummy_at);
+
+ attr_type = at.get_type(iter);
+ CPPUNIT_ASSERT(attr_type == "String");
+
+ attr_type_enum = at.get_attr_type(iter);
+ CPPUNIT_ASSERT(attr_type_enum == Attr_string);
+
+ attr_value = at.get_attr(iter);
+ CPPUNIT_ASSERT(attr_value == "attr3Value1");
+
+ attr_value = at.get_attr(iter, 1);
+ CPPUNIT_ASSERT(attr_value == "attr3Value2");
+
+ values = at.get_attr_vector(iter);
+ CPPUNIT_ASSERT(values);
+ if (values) {
+ str_citer vi = values->begin();
+ str_citer sbi = sb.begin();
+ for (; vi != values->end() && sbi != sb.end(); vi++, sbi++) {
+ CPPUNIT_ASSERT((*vi) == (*sbi));
+ }
+ CPPUNIT_ASSERT(vi == values->end() && sbi == sb.end());
+ if (vi == values->end() && sbi != sb.end()) {
+ CPPUNIT_FAIL("not enough values");
+ }
+ else if (vi != values->end() && sbi == sb.end()) {
+ CPPUNIT_FAIL("too many values");
+ }
+ }
+
+ {
+ str_iter sbi = sb.begin();
+ sbi++;
+ sb.erase(sbi);
+ }
+
+ at.del_attr("attr3", 1);
+ values = at.get_attr_vector(iter);
+ CPPUNIT_ASSERT(values);
+ if (values) {
+ str_citer vi = values->begin();
+ str_citer sbi = sb.begin();
+ for (; vi != values->end() && sbi != sb.end(); vi++, sbi++) {
+ CPPUNIT_ASSERT((*vi) == (*sbi));
+ }
+ CPPUNIT_ASSERT(vi == values->end() && sbi == sb.end());
+ if (vi == values->end() && sbi != sb.end()) {
+ CPPUNIT_FAIL("not enough values");
+ }
+ else if (vi != values->end() && sbi == sb.end()) {
+ CPPUNIT_FAIL("too many values");
+ }
+ }
+
+ at.del_attr("attr3");
+ container = 0;
+ try {
+ container = at.append_container("attr2");
+ CPPUNIT_FAIL("added container named attr2 successfully - already exists");
+ }
+ catch (Error &e) {
+ }
+ CPPUNIT_ASSERT(!container);
+
+ try {
+ container = at.append_container("attr5");
+ }
+ catch (Error &e) {
+ CPPUNIT_FAIL("failed to add new container attr5");
+ }
+ CPPUNIT_ASSERT(container);
+ if (container) {
+ CPPUNIT_ASSERT(container->get_name() == "attr5");
+ }
+
+ container = at.find_container("attr5");
+ CPPUNIT_ASSERT(container);
+ if (container) {
+ string container_name = container->get_name();
+ CPPUNIT_ASSERT(container_name == "attr5");
+ }
+
+ iter = at.attr_end();
+ at.find("attr5", &dummy_at, &iter);
+ CPPUNIT_ASSERT(iter != at.attr_end());
+ attr_name = at.get_name(iter);
+ CPPUNIT_ASSERT(attr_name == "attr5");
+ isit = at.is_container(iter);
+ CPPUNIT_ASSERT(isit == true);
+ container = at.get_attr_table(iter);
+ CPPUNIT_ASSERT(container);
+ attr_type = at.get_type(iter);
+ CPPUNIT_ASSERT(attr_type == "Container");
+ attr_type_enum = at.get_attr_type(iter);
+ CPPUNIT_ASSERT(attr_type_enum == Attr_container);
+
+ /* FIX: does append attr return anything? */
+ container->append_attr("attr5-1", "string", "attr5.1Value1");
+ container->append_attr("attr5-2", "string", "attr5.2Value1");
+ container->append_attr("attr5-3", "string", "attr5.3Value1");
+ container->append_attr("attr5-4", "string", "attr5.4Value1");
+ iter = at.attr_end();
+ at.find("attr5.attr5-3", &dummy_at, &iter);
+ CPPUNIT_ASSERT(iter != at.attr_end());
+ CPPUNIT_ASSERT(container == dummy_at);
+
+ //at.print( stdout ) ;
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( attrTableT ) ;
+CPPUNIT_TEST_SUITE_REGISTRATION(attrTableT);
/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
-int main( int, char ** )
+int main(int argc, char *argv[])
{
- CppUnit::TextUi::TestRunner runner ;
- CppUnit::TestFactoryRegistry ®istry =
- CppUnit::TestFactoryRegistry::getRegistry() ;
- runner.addTest( registry.makeTest() ) ;
- runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(
- &runner.result(),
- std::cerr ) );
- bool wasSuccessful = runner.run( "", false ) ;
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: attrTableT has the following tests:" << endl;
+ const std::vector<Test*> &tests = attrTableT::suite()->getTests();
+ unsigned int prefix_len = attrTableT::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = attrTableT::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+
return wasSuccessful ? 0 : 1;
}
-
diff --git a/unit-tests/cache-testsuite/Makefile.in b/unit-tests/cache-testsuite/Makefile.in
index 014d368..d47a2a4 100644
--- a/unit-tests/cache-testsuite/Makefile.in
+++ b/unit-tests/cache-testsuite/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -34,7 +78,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = unit-tests/cache-testsuite
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
$(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -89,14 +133,33 @@ CONFIG_HEADER = $(top_builddir)/config.h \
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SCRIPTS = $(noinst_SCRIPTS)
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
@@ -136,6 +199,7 @@ DAPLIB_REVISION = @DAPLIB_REVISION@
DAP_PROTOCOL_VERSION = @DAP_PROTOCOL_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DVR = @DVR@
@@ -451,6 +515,7 @@ LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
@@ -484,6 +549,7 @@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
@@ -588,6 +654,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -630,7 +697,6 @@ libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -691,11 +757,11 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -742,10 +808,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -827,16 +898,16 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- clean-local distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-dvi \
+ clean-local cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am
+ tags-am uninstall uninstall-am
cleanup.sh: cleanup.sh.in ../../config.status
diff --git a/unit-tests/chunked_iostream_test.cc b/unit-tests/chunked_iostream_test.cc
index d9ae0d9..dfe1144 100644
--- a/unit-tests/chunked_iostream_test.cc
+++ b/unit-tests/chunked_iostream_test.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -46,7 +45,7 @@
static bool debug = false;
-const string path = (string)TEST_SRC_DIR + "/chunked-io";
+const string path = (string) TEST_SRC_DIR + "/chunked-io";
#undef DBG
#define DBG(x) do { if (debug) (x); } while(false);
@@ -63,12 +62,12 @@ using namespace libdap;
*/
class chunked_iostream_test: public TestFixture {
private:
- // This should be big enough to do meaningful timing tests
- string big_file, big_file_2, big_file_3;
- // This should be smaller than a single buffer
- string small_file;
- // A modest sized text file - makes looking at the results easier
- string text_file;
+ // This should be big enough to do meaningful timing tests
+ string big_file, big_file_2, big_file_3;
+ // This should be smaller than a single buffer
+ string small_file;
+ // A modest sized text file - makes looking at the results easier
+ string text_file;
public:
chunked_iostream_test()
{
@@ -79,71 +78,67 @@ public:
void setUp()
{
- big_file = path + "/test_big_binary_file.bin";
- big_file_2 = path + "/test_big_binary_file_2.bin";
- big_file_3 = path + "/test_big_binary_file_3.bin"; // not used yet
+ big_file = path + "/test_big_binary_file.bin";
+ big_file_2 = path + "/test_big_binary_file_2.bin";
+ big_file_3 = path + "/test_big_binary_file_3.bin"; // not used yet
- small_file = path + "/test_small_text_file.txt";
- text_file = path + "/test_text_file.txt";
+ small_file = path + "/test_small_text_file.txt";
+ text_file = path + "/test_text_file.txt";
}
void tearDown()
{
}
- void
- single_char_write(const string &file, int buf_size)
+ void single_char_write(const string &file, int buf_size)
{
- fstream infile(file.c_str(), ios::in|ios::binary);
- DBG(cerr << "infile: " << file << endl);
- if (!infile.good())
- CPPUNIT_FAIL("File not open or eof");
-
- string out = file + ".chunked";
- fstream outfile(out.c_str(), ios::out|ios::binary);
-
- chunked_ostream chunked_outfile(outfile, buf_size);
-
- char c;
- infile.read(&c, 1);
- int num = infile.gcount();
- while (num > 0 && !infile.eof()) {
- chunked_outfile.write(&c, num);
- infile.read(&c, 1);
- num = infile.gcount();
- }
+ fstream infile(file.c_str(), ios::in | ios::binary);
+ DBG(cerr << "infile: " << file << endl);
+ if (!infile.good()) CPPUNIT_FAIL("File not open or eof");
+
+ string out = file + ".chunked";
+ fstream outfile(out.c_str(), ios::out | ios::binary);
+
+ chunked_ostream chunked_outfile(outfile, buf_size);
+
+ char c;
+ infile.read(&c, 1);
+ int num = infile.gcount();
+ while (num > 0 && !infile.eof()) {
+ chunked_outfile.write(&c, num);
+ infile.read(&c, 1);
+ num = infile.gcount();
+ }
- if (num > 0 && !infile.bad()) {
- chunked_outfile.write(&c, num);
- }
+ if (num > 0 && !infile.bad()) {
+ chunked_outfile.write(&c, num);
+ }
- chunked_outfile.flush();
+ chunked_outfile.flush();
}
- void
- write_128char_data(const string &file, int buf_size)
+ void write_128char_data(const string &file, int buf_size)
{
- fstream infile(file.c_str(), ios::in|ios::binary);
- if (!infile.good())
- CPPUNIT_FAIL("File not open or eof");
+ fstream infile(file.c_str(), ios::in | ios::binary);
+ if (!infile.good()) CPPUNIT_FAIL("File not open or eof");
- string out = file + ".chunked";
- fstream outfile(out.c_str(), ios::out|ios::binary);
+ string out = file + ".chunked";
+ fstream outfile(out.c_str(), ios::out | ios::binary);
- chunked_ostream chunked_outfile(outfile, buf_size);
+ chunked_ostream chunked_outfile(outfile, buf_size);
- char str[128];
- infile.read(str, 128);
- int num = infile.gcount();
- while (num > 0 && !infile.eof()) {
- chunked_outfile.write(str, num);
- infile.read(str, 128);
- num = infile.gcount();
- }
+ char str[128];
+ infile.read(str, 128);
+ int num = infile.gcount();
+ while (num > 0 && !infile.eof()) {
+ chunked_outfile.write(str, num);
+ infile.read(str, 128);
+ num = infile.gcount();
+ }
- if (num > 0 && !infile.bad()) {
- chunked_outfile.write(str, num);
- }
+ if (num > 0 && !infile.bad()) {
+ chunked_outfile.write(str, num);
+ }
chunked_outfile.flush();
}
@@ -155,195 +150,188 @@ public:
// tries to send an End chunk with one or more bytes as opposed to
// sending the last data chunk with fewer than buf_size and then sending a
// zero length END chunk).
- void
- write_24char_data_with_error_option(const string &file, int buf_size, bool error = false)
+ void write_24char_data_with_error_option(const string &file, int buf_size, bool error = false)
{
- fstream infile(file.c_str(), ios::in|ios::binary);
- if (!infile.good())
- CPPUNIT_FAIL("File not open or eof");
-
- string out = file + ".chunked";
- fstream outfile(out.c_str(), ios::out|ios::binary);
-
- chunked_ostream chunked_outfile(outfile, buf_size);
-
- try {
- char str[24];
- infile.read(str, 24);
- int num = infile.gcount();
- if (num > 0 && !infile.eof()) {
- chunked_outfile.write(str, num);
- chunked_outfile.flush();
- }
-
- infile.read(str, 24);
- num = infile.gcount();
- if (num > 0 && !infile.eof()) chunked_outfile.write(str, num);
-
- // Send an error chunk; the 24 bytes read here are lost...
- if (error)
- throw Error("Testing error transmission");
-
- infile.read(str, 24);
- num = infile.gcount();
- while (num == 24 && !infile.eof()) {
- chunked_outfile.write(str, num);
- infile.read(str, 24);
- num = infile.gcount();
- }
-
- if (num > 0 && !infile.bad()) {
- chunked_outfile.write(str, num);
- }
-
- // flush() calls sync() which forces a DATA chunk to be sent, regardless of
- // the amount of data in the buffer. When the stream is destroyed, end_chunk()
- // is sent with the remain chars, so removing flush() here ensures that we test
- // a non-empty END chunk.
+ fstream infile(file.c_str(), ios::in | ios::binary);
+ if (!infile.good()) CPPUNIT_FAIL("File not open or eof");
+
+ string out = file + ".chunked";
+ fstream outfile(out.c_str(), ios::out | ios::binary);
+
+ chunked_ostream chunked_outfile(outfile, buf_size);
+
+ try {
+ char str[24];
+ infile.read(str, 24);
+ int num = infile.gcount();
+ if (num > 0 && !infile.eof()) {
+ chunked_outfile.write(str, num);
+ chunked_outfile.flush();
+ }
+
+ infile.read(str, 24);
+ num = infile.gcount();
+ if (num > 0 && !infile.eof()) chunked_outfile.write(str, num);
+
+ // Send an error chunk; the 24 bytes read here are lost...
+ if (error) throw Error("Testing error transmission");
+
+ infile.read(str, 24);
+ num = infile.gcount();
+ while (num == 24 && !infile.eof()) {
+ chunked_outfile.write(str, num);
+ infile.read(str, 24);
+ num = infile.gcount();
+ }
+
+ if (num > 0 && !infile.bad()) {
+ chunked_outfile.write(str, num);
+ }
+
+ // flush() calls sync() which forces a DATA chunk to be sent, regardless of
+ // the amount of data in the buffer. When the stream is destroyed, end_chunk()
+ // is sent with the remain chars, so removing flush() here ensures that we test
+ // a non-empty END chunk.
// chunked_outfile.flush();
- }
- catch (Error &e) {
- chunked_outfile.write_err_chunk(e.get_error_message());
- }
+ }
+ catch (Error &e) {
+ chunked_outfile.write_err_chunk(e.get_error_message());
+ }
}
- void
- single_char_read(const string &file, int buf_size)
+ void single_char_read(const string &file, int buf_size)
{
- string in = file + ".chunked";
- fstream infile(in.c_str(), ios::in|ios::binary);
- if (!infile.good())
- CPPUNIT_FAIL("File not open or eof");
+ string in = file + ".chunked";
+ fstream infile(in.c_str(), ios::in | ios::binary);
+ if (!infile.good()) CPPUNIT_FAIL("File not open or eof");
#if BYTE_ORDER_PREFIX
- chunked_istream chunked_infile(infile, buf_size, 0x00);
+ chunked_istream chunked_infile(infile, buf_size, 0x00);
#else
- chunked_istream chunked_infile(infile, buf_size);
+ chunked_istream chunked_infile(infile, buf_size);
#endif
- string out = file + ".plain";
- fstream outfile(out.c_str(), ios::out|ios::binary);
-
- char c;
- int count = 1;
- chunked_infile.read(&c, 1);
- int num = chunked_infile.gcount();
- DBG(cerr << "num: " << num << ", " << count++ << endl);
- while (num > 0 && !chunked_infile.eof()) {
- outfile.write(&c, num);
- chunked_infile.read(&c, 1);
- num = chunked_infile.gcount();
- DBG(cerr << "num: " << num << ", " << count++ << ", eof: " << chunked_infile.eof() << endl);
- }
+ string out = file + ".plain";
+ fstream outfile(out.c_str(), ios::out | ios::binary);
+
+ char c;
+ int count = 1;
+ chunked_infile.read(&c, 1);
+ int num = chunked_infile.gcount();
+ DBG(cerr << "num: " << num << ", " << count++ << endl);
+ while (num > 0 && !chunked_infile.eof()) {
+ outfile.write(&c, num);
+ chunked_infile.read(&c, 1);
+ num = chunked_infile.gcount();
+ DBG(cerr << "num: " << num << ", " << count++ << ", eof: " << chunked_infile.eof() << endl);
+ }
- DBG(cerr << "eof is :" << chunked_infile.eof() << ", num: " << num << endl);
+ DBG(cerr << "eof is :" << chunked_infile.eof() << ", num: " << num << endl);
- if (num > 0 && !chunked_infile.bad())
- outfile.write(&c, num);
+ if (num > 0 && !chunked_infile.bad()) outfile.write(&c, num);
- outfile.flush();
+ outfile.flush();
}
- void
- read_128char_data(const string &file, int buf_size)
+ void read_128char_data(const string &file, int buf_size)
{
- string in = file + ".chunked";
- fstream infile(in.c_str(), ios::in|ios::binary);
- if (!infile.good())
- cerr << "File not open or eof" << endl;
- chunked_istream chunked_infile(infile, buf_size);
-
- string out = file + ".plain";
- fstream outfile(out.c_str(), ios::out|ios::binary);
-
- char str[128];
- int count = 1;
- chunked_infile.read(str, 128);
- int num = chunked_infile.gcount();
- DBG(cerr << "num: " << num << ", " << count++ << endl);
- while (num > 0 && !chunked_infile.eof()) {
- outfile.write(str, num);
- chunked_infile.read(str, 128);
- num = chunked_infile.gcount();
- DBG(cerr << "num: " << num << ", " << count++ << ", eof: " << chunked_infile.eof() << endl);
- }
-
- if (num > 0 && !chunked_infile.bad()) {
- outfile.write(str, num);
- }
-
- outfile.flush();
- }
-
- void
- read_24char_data_with_error_option(const string &file, int buf_size)
+ string in = file + ".chunked";
+ fstream infile(in.c_str(), ios::in | ios::binary);
+ if (!infile.good()) cerr << "File not open or eof" << endl;
+ chunked_istream chunked_infile(infile, buf_size);
+
+ string out = file + ".plain";
+ fstream outfile(out.c_str(), ios::out | ios::binary);
+
+ char str[128];
+ int count = 1;
+ chunked_infile.read(str, 128);
+ int num = chunked_infile.gcount();
+ DBG(cerr << "num: " << num << ", " << count++ << endl);
+ while (num > 0 && !chunked_infile.eof()) {
+ outfile.write(str, num);
+ chunked_infile.read(str, 128);
+ num = chunked_infile.gcount();
+ DBG(cerr << "num: " << num << ", " << count++ << ", eof: " << chunked_infile.eof() << endl);
+ }
+
+ if (num > 0 && !chunked_infile.bad()) {
+ outfile.write(str, num);
+ }
+
+ outfile.flush();
+ }
+
+ void read_24char_data_with_error_option(const string &file, int buf_size)
{
- string in = file + ".chunked";
- fstream infile(in.c_str(), ios::in|ios::binary);
- if (!infile.good())
- cerr << "File not open or eof" << endl;
- chunked_istream chunked_infile(infile, buf_size);
+ string in = file + ".chunked";
+ fstream infile(in.c_str(), ios::in | ios::binary);
+ if (!infile.good()) cerr << "File not open or eof" << endl;
+ chunked_istream chunked_infile(infile, buf_size);
- string out = file + ".plain";
- fstream outfile(out.c_str(), ios::out|ios::binary);
+ string out = file + ".plain";
+ fstream outfile(out.c_str(), ios::out | ios::binary);
- try {
+ try {
#if 0
- chunked_infile.read(str, 24);
- int num = chunked_infile.gcount();
- if (num > 0 && !chunked_infile.eof()) {
- outfile.write(str, num);
- outfile.flush();
- }
+ chunked_infile.read(str, 24);
+ int num = chunked_infile.gcount();
+ if (num > 0 && !chunked_infile.eof()) {
+ outfile.write(str, num);
+ outfile.flush();
+ }
#endif
- char str[24];
- chunked_infile.read(str, 24);
- int num = chunked_infile.gcount();
- while (num > 0 && !chunked_infile.eof()) {
- outfile.write(str, num);
- chunked_infile.read(str, 24);
- num = chunked_infile.gcount();
- }
-
- // The chunked_istream uses a chunked_inbuf and that signals error
- // using EOF. The error message is stored in the buffer and can be
- // detected and accessed using the error() error_message() methods
- // that both the buffer and istream classes have.
- if (chunked_infile.error())
- throw Error("Found an error in the stream");
-
- if (num > 0 && !chunked_infile.bad()) {
- outfile.write(str, num);
- }
-
- outfile.flush();
- }
- catch (Error &e) {
- DBG(cerr << "Error chunk found: " << e.get_error_message() << endl);
- throw;
- }
+ char str[24];
+ chunked_infile.read(str, 24);
+ int num = chunked_infile.gcount();
+ while (num > 0 && !chunked_infile.eof()) {
+ outfile.write(str, num);
+ chunked_infile.read(str, 24);
+ num = chunked_infile.gcount();
+ }
+
+ // The chunked_istream uses a chunked_inbuf and that signals error
+ // using EOF. The error message is stored in the buffer and can be
+ // detected and accessed using the error() error_message() methods
+ // that both the buffer and istream classes have.
+ if (chunked_infile.error()) throw Error("Found an error in the stream");
+
+ if (num > 0 && !chunked_infile.bad()) {
+ outfile.write(str, num);
+ }
+
+ outfile.flush();
+ }
+ catch (Error &e) {
+ DBG(cerr << "Error chunk found: " << e.get_error_message() << endl);
+ throw;
+ }
}
// these are the tests
- void test_write_1_read_1_small_file() {
- single_char_write(small_file, 32);
- single_char_read(small_file, 32);
- string cmp = "cmp " + small_file + " " + small_file + ".plain";
- CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+ void test_write_1_read_1_small_file()
+ {
+ single_char_write(small_file, 32);
+ single_char_read(small_file, 32);
+ string cmp = "cmp " + small_file + " " + small_file + ".plain";
+ CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_1_read_1_text_file() {
- single_char_write(text_file, 32);
- single_char_read(text_file, 32);
- string cmp = "cmp " + text_file + " " + text_file + ".plain";
- CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
+ void test_write_1_read_1_text_file()
+ {
+ single_char_write(text_file, 32);
+ single_char_read(text_file, 32);
+ string cmp = "cmp " + text_file + " " + text_file + ".plain";
+ CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_1_read_1_big_file() {
+ void test_write_1_read_1_big_file()
+ {
single_char_write(big_file, 28);
single_char_read(big_file, 28);
string cmp = "cmp " + big_file + " " + big_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_1_read_1_big_file_2() {
+ void test_write_1_read_1_big_file_2()
+ {
single_char_write(big_file_2, 28);
single_char_read(big_file_2, 28);
string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
@@ -351,28 +339,32 @@ public:
}
// these are the tests
- void test_write_1_read_128_small_file() {
+ void test_write_1_read_128_small_file()
+ {
single_char_write(small_file, 32);
read_128char_data(small_file, 32);
string cmp = "cmp " + small_file + " " + small_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_1_read_128_text_file() {
+ void test_write_1_read_128_text_file()
+ {
single_char_write(text_file, 32);
read_128char_data(text_file, 32);
string cmp = "cmp " + text_file + " " + text_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_1_read_128_big_file() {
+ void test_write_1_read_128_big_file()
+ {
single_char_write(big_file, 28);
read_128char_data(big_file, 28);
string cmp = "cmp " + big_file + " " + big_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_1_read_128_big_file_2() {
+ void test_write_1_read_128_big_file_2()
+ {
single_char_write(big_file_2, 28);
read_128char_data(big_file_2, 28);
string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
@@ -381,98 +373,110 @@ public:
// 24 char write units
- void test_write_24_read_1_text_file() {
- write_24char_data_with_error_option(text_file, 32);
- single_char_read(text_file, 32);
+ void test_write_24_read_1_text_file()
+ {
+ write_24char_data_with_error_option(text_file, 32);
+ single_char_read(text_file, 32);
string cmp = "cmp " + text_file + " " + text_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_24_read_1_big_file() {
- write_24char_data_with_error_option(big_file, 1024);
- DBG(cerr << "Wrote the file" << endl);
+ void test_write_24_read_1_big_file()
+ {
+ write_24char_data_with_error_option(big_file, 1024);
+ DBG(cerr << "Wrote the file" << endl);
- single_char_read(big_file, 1024);
+ single_char_read(big_file, 1024);
string cmp = "cmp " + big_file + " " + big_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_24_read_1_big_file_2() {
- write_24char_data_with_error_option(big_file_2, 1024);
- DBG(cerr << "Wrote the file" << endl);
+ void test_write_24_read_1_big_file_2()
+ {
+ write_24char_data_with_error_option(big_file_2, 1024);
+ DBG(cerr << "Wrote the file" << endl);
- single_char_read(big_file_2, 1024);
+ single_char_read(big_file_2, 1024);
string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_24_read_128_text_file() {
- write_24char_data_with_error_option(text_file, 32);
+ void test_write_24_read_128_text_file()
+ {
+ write_24char_data_with_error_option(text_file, 32);
read_128char_data(text_file, 32);
string cmp = "cmp " + text_file + " " + text_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_24_read_128_big_file() {
- write_24char_data_with_error_option(big_file, 28);
- DBG(cerr << "Wrote the file" << endl);
+ void test_write_24_read_128_big_file()
+ {
+ write_24char_data_with_error_option(big_file, 28);
+ DBG(cerr << "Wrote the file" << endl);
read_128char_data(big_file, 28);
string cmp = "cmp " + big_file + " " + big_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_24_read_128_big_file_2() {
- write_24char_data_with_error_option(big_file_2, 28);
+ void test_write_24_read_128_big_file_2()
+ {
+ write_24char_data_with_error_option(big_file_2, 28);
read_128char_data(big_file_2, 28);
string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
// 128 char writes
- void test_write_128_read_1_text_file() {
- write_128char_data(text_file, 32);
- single_char_read(text_file, 32);
+ void test_write_128_read_1_text_file()
+ {
+ write_128char_data(text_file, 32);
+ single_char_read(text_file, 32);
string cmp = "cmp " + text_file + " " + text_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_128_read_1_big_file() {
- write_128char_data(big_file, 32);
- DBG(cerr << "Wrote the file" << endl);
+ void test_write_128_read_1_big_file()
+ {
+ write_128char_data(big_file, 32);
+ DBG(cerr << "Wrote the file" << endl);
- single_char_read(big_file, 32);
+ single_char_read(big_file, 32);
string cmp = "cmp " + big_file + " " + big_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_128_read_1_big_file_2() {
- write_128char_data(big_file_2, 32);
- DBG(cerr << "Wrote the file" << endl);
+ void test_write_128_read_1_big_file_2()
+ {
+ write_128char_data(big_file_2, 32);
+ DBG(cerr << "Wrote the file" << endl);
- single_char_read(big_file_2, 1024);
+ single_char_read(big_file_2, 1024);
string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_128_read_128_text_file() {
- write_128char_data(text_file, 32);
+ void test_write_128_read_128_text_file()
+ {
+ write_128char_data(text_file, 32);
read_128char_data(text_file, 32);
string cmp = "cmp " + text_file + " " + text_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_128_read_128_big_file() {
- write_128char_data(big_file, 28);
- DBG(cerr << "Wrote the file" << endl);
+ void test_write_128_read_128_big_file()
+ {
+ write_128char_data(big_file, 28);
+ DBG(cerr << "Wrote the file" << endl);
read_128char_data(big_file, 28);
string cmp = "cmp " + big_file + " " + big_file + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
}
- void test_write_128_read_128_big_file_2() {
- write_128char_data(big_file_2, 28);
+ void test_write_128_read_128_big_file_2()
+ {
+ write_128char_data(big_file_2, 28);
read_128char_data(big_file_2, 28);
string cmp = "cmp " + big_file_2 + " " + big_file_2 + ".plain";
CPPUNIT_ASSERT(system(cmp.c_str()) == 0);
@@ -480,65 +484,76 @@ public:
// Send an error
- void test_write_24_read_24_big_file_2_error() {
- write_24char_data_with_error_option(big_file_2, 2048, true /*error*/);
- try {
- read_24char_data_with_error_option(big_file_2, 2048);
- CPPUNIT_FAIL("Should have caught an error message");
- }
- catch (Error &e) {
- CPPUNIT_ASSERT(!e.get_error_message().empty());
- }
- }
+ void test_write_24_read_24_big_file_2_error()
+ {
+ write_24char_data_with_error_option(big_file_2, 2048, true /*error*/);
+ try {
+ read_24char_data_with_error_option(big_file_2, 2048);
+ CPPUNIT_FAIL("Should have caught an error message");
+ }
+ catch (Error &e) {
+ CPPUNIT_ASSERT(!e.get_error_message().empty());
+ }
+ }
- CPPUNIT_TEST_SUITE(chunked_iostream_test);
+ CPPUNIT_TEST_SUITE (chunked_iostream_test);
- CPPUNIT_TEST(test_write_1_read_1_small_file);
- CPPUNIT_TEST(test_write_1_read_1_text_file);
- CPPUNIT_TEST(test_write_1_read_1_big_file);
- CPPUNIT_TEST(test_write_1_read_1_big_file_2);
+ CPPUNIT_TEST (test_write_1_read_1_small_file);
+ CPPUNIT_TEST (test_write_1_read_1_text_file);
+ CPPUNIT_TEST (test_write_1_read_1_big_file);
+ CPPUNIT_TEST (test_write_1_read_1_big_file_2);
- CPPUNIT_TEST(test_write_1_read_128_small_file);
- CPPUNIT_TEST(test_write_1_read_128_text_file);
- CPPUNIT_TEST(test_write_1_read_128_big_file);
- CPPUNIT_TEST(test_write_1_read_128_big_file_2);
+ CPPUNIT_TEST (test_write_1_read_128_small_file);
+ CPPUNIT_TEST (test_write_1_read_128_text_file);
+ CPPUNIT_TEST (test_write_1_read_128_big_file);
+ CPPUNIT_TEST (test_write_1_read_128_big_file_2);
- CPPUNIT_TEST(test_write_24_read_1_text_file);
- CPPUNIT_TEST(test_write_24_read_1_big_file);
- CPPUNIT_TEST(test_write_24_read_1_big_file_2);
+ CPPUNIT_TEST (test_write_24_read_1_text_file);
+ CPPUNIT_TEST (test_write_24_read_1_big_file);
+ CPPUNIT_TEST (test_write_24_read_1_big_file_2);
- CPPUNIT_TEST(test_write_24_read_128_text_file);
- CPPUNIT_TEST(test_write_24_read_128_big_file);
- CPPUNIT_TEST(test_write_24_read_128_big_file_2);
+ CPPUNIT_TEST (test_write_24_read_128_text_file);
+ CPPUNIT_TEST (test_write_24_read_128_big_file);
+ CPPUNIT_TEST (test_write_24_read_128_big_file_2);
- CPPUNIT_TEST(test_write_128_read_1_text_file);
- CPPUNIT_TEST(test_write_128_read_1_big_file);
- CPPUNIT_TEST(test_write_128_read_1_big_file_2);
+ CPPUNIT_TEST (test_write_128_read_1_text_file);
+ CPPUNIT_TEST (test_write_128_read_1_big_file);
+ CPPUNIT_TEST (test_write_128_read_1_big_file_2);
- CPPUNIT_TEST(test_write_128_read_128_text_file);
- CPPUNIT_TEST(test_write_128_read_128_big_file);
- CPPUNIT_TEST(test_write_128_read_128_big_file_2);
+ CPPUNIT_TEST (test_write_128_read_128_text_file);
+ CPPUNIT_TEST (test_write_128_read_128_big_file);
+ CPPUNIT_TEST (test_write_128_read_128_big_file_2);
- CPPUNIT_TEST(test_write_24_read_24_big_file_2_error);
+ CPPUNIT_TEST (test_write_24_read_24_big_file_2_error);
CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(chunked_iostream_test);
+CPPUNIT_TEST_SUITE_REGISTRATION (chunked_iostream_test);
-int
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
- GetOpt getopt(argc, argv, "d");
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
switch (option_char) {
- case 'd':
- debug = 1; // debug is a static global
- break;
- default:
- break;
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: chunked_iostream_test has the following tests:" << endl;
+ const std::vector<Test*> &tests = chunked_iostream_test::suite()->getTests();
+ unsigned int prefix_len = chunked_iostream_test::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
}
CppUnit::TextTestRunner runner;
@@ -552,10 +567,9 @@ main(int argc, char *argv[])
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("chunked_iostream_test::") + argv[i++];
- if (debug)
- cerr << "Running " << test << endl;
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = chunked_iostream_test::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/dasT.cc b/unit-tests/dasT.cc
index d8aeadc..a2277fd 100644
--- a/unit-tests/dasT.cc
+++ b/unit-tests/dasT.cc
@@ -1,4 +1,3 @@
-
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -15,11 +14,16 @@
#include "DAS.h"
#include "testFile.h"
+#include "GetOpt.h"
using namespace std;
using namespace libdap;
+using namespace CppUnit;
+
+static bool debug = false;
-string dprint = "\
+string dprint =
+ "\
Attributes {\n\
c1 {\n\
v1 {\n\
@@ -47,130 +51,159 @@ Attributes {\n\
}\n\
}\n\
}\n\
-" ;
+";
-class dasT : public CppUnit::TestFixture {
+class dasT: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE( dasT ) ;
-CPPUNIT_TEST( dasT_test ) ;
-CPPUNIT_TEST_SUITE_END( ) ;
+ CPPUNIT_TEST_SUITE (dasT);
+ CPPUNIT_TEST (dasT_test);CPPUNIT_TEST_SUITE_END( );
private:
/* TEST PRIVATE DATA */
-
+
public:
void setUp()
{
}
- void tearDown()
+ void tearDown()
{
}
void dasT_test()
{
- DAS das ;
- CPPUNIT_ASSERT( das.get_size() == 0 ) ;
- CPPUNIT_ASSERT( das.container_name().empty() ) ;
- CPPUNIT_ASSERT( das.container() == 0 ) ;
-
- // set container to c1 and make sure set correctly
- das.container_name( "c1" ) ;
- CPPUNIT_ASSERT( das.container_name() == "c1" ) ;
- CPPUNIT_ASSERT( das.container() ) ;
- CPPUNIT_ASSERT( das.container()->get_name() == "c1" ) ;
- CPPUNIT_ASSERT( das.get_size() == 0 ) ;
-
- // set back to upermost attribute table and test
- das.container_name( "" ) ;
- CPPUNIT_ASSERT( das.container_name().empty() ) ;
- CPPUNIT_ASSERT( !das.container() ) ;
- CPPUNIT_ASSERT( das.get_size() == 1 ) ;
-
- // change to c2
- das.container_name( "c2" ) ;
- CPPUNIT_ASSERT( das.container_name() == "c2" ) ;
- CPPUNIT_ASSERT( das.container() ) ;
- CPPUNIT_ASSERT( das.container()->get_name() == "c2" ) ;
- CPPUNIT_ASSERT( das.get_size() == 0 ) ;
-
- // set back to upermost attribute table and test
- das.container_name( "" ) ;
- CPPUNIT_ASSERT( das.container_name().empty() ) ;
- CPPUNIT_ASSERT( !das.container() ) ;
- CPPUNIT_ASSERT( das.get_size() == 2 ) ;
-
- // change back to c1, make sure not another c1 added
- das.container_name( "c1" ) ;
- CPPUNIT_ASSERT( das.container_name() == "c1" ) ;
- CPPUNIT_ASSERT( das.container() ) ;
- CPPUNIT_ASSERT( das.container()->get_name() == "c1" ) ;
- CPPUNIT_ASSERT( das.get_size() == 0 ) ;
-
- // set back to upermost attribute table and test
- das.container_name( "" ) ;
- CPPUNIT_ASSERT( das.container_name().empty() ) ;
- CPPUNIT_ASSERT( !das.container() ) ;
- CPPUNIT_ASSERT( das.get_size() == 2 ) ;
-
- // add stuff to das, should go to c1
- das.container_name( "c1" ) ;
- AttrTable *v1 = new AttrTable ;
- das.add_table( "v1", v1 ) ;
- v1->append_attr( "v1a1", "String", "v1a1val" ) ;
- v1->append_attr( "v1a2", "String", "v1a2val" ) ;
- v1->append_attr( "v1a3", "String", "v1a3val" ) ;
- v1->append_attr( "v1a4", "String", "v1a4val" ) ;
- AttrTable *v1v1 = v1->append_container( "v1v1" ) ;
- v1v1->append_attr( "v1v1a1", "String", "v1v1a1val" ) ;
- v1v1->append_attr( "v1v1a2", "String", "v1v1a2val" ) ;
-
- // check container and das size
- CPPUNIT_ASSERT( das.get_size() == 1 ) ;
- das.container_name( "" ) ;
- CPPUNIT_ASSERT( das.get_size() == 2 ) ;
-
- // add stuff to das, should go to c2
- das.container_name( "c2" ) ;
- AttrTable *v2 = new AttrTable ;
- das.add_table( "v2", v2 ) ;
- v2->append_attr( "v2a1", "String", "v2a1val" ) ;
- v2->append_attr( "v2a2", "String", "v2a2val" ) ;
- AttrTable *v3 = new AttrTable ;
- das.add_table( "v3", v3 ) ;
- v3->append_attr( "v3a1", "String", "v3a1val" ) ;
- v3->append_attr( "v3a2", "String", "v3a2val" ) ;
- AttrTable *v3v1 = v3->append_container( "v3v1" ) ;
- v3v1->append_attr( "v3v1a1", "String", "v3v1a1val" ) ;
-
- // check container and das size
- CPPUNIT_ASSERT( das.get_size() == 2 ) ;
- das.container_name( "" ) ;
- CPPUNIT_ASSERT( das.get_size() == 2 ) ;
-
- // print to stream and compare results
- ostringstream strm ;
- das.print( strm ) ;
- cout << strm.str() << endl ;
- cout << dprint << endl ;
- CPPUNIT_ASSERT( strm.str() == dprint ) ;
+ DAS das;
+ CPPUNIT_ASSERT(das.get_size() == 0);
+ CPPUNIT_ASSERT(das.container_name().empty());
+ CPPUNIT_ASSERT(das.container() == 0);
+
+ // set container to c1 and make sure set correctly
+ das.container_name("c1");
+ CPPUNIT_ASSERT(das.container_name() == "c1");
+ CPPUNIT_ASSERT(das.container());
+ CPPUNIT_ASSERT(das.container()->get_name() == "c1");
+ CPPUNIT_ASSERT(das.get_size() == 0);
+
+ // set back to upermost attribute table and test
+ das.container_name("");
+ CPPUNIT_ASSERT(das.container_name().empty());
+ CPPUNIT_ASSERT(!das.container());
+ CPPUNIT_ASSERT(das.get_size() == 1);
+
+ // change to c2
+ das.container_name("c2");
+ CPPUNIT_ASSERT(das.container_name() == "c2");
+ CPPUNIT_ASSERT(das.container());
+ CPPUNIT_ASSERT(das.container()->get_name() == "c2");
+ CPPUNIT_ASSERT(das.get_size() == 0);
+
+ // set back to upermost attribute table and test
+ das.container_name("");
+ CPPUNIT_ASSERT(das.container_name().empty());
+ CPPUNIT_ASSERT(!das.container());
+ CPPUNIT_ASSERT(das.get_size() == 2);
+
+ // change back to c1, make sure not another c1 added
+ das.container_name("c1");
+ CPPUNIT_ASSERT(das.container_name() == "c1");
+ CPPUNIT_ASSERT(das.container());
+ CPPUNIT_ASSERT(das.container()->get_name() == "c1");
+ CPPUNIT_ASSERT(das.get_size() == 0);
+
+ // set back to upermost attribute table and test
+ das.container_name("");
+ CPPUNIT_ASSERT(das.container_name().empty());
+ CPPUNIT_ASSERT(!das.container());
+ CPPUNIT_ASSERT(das.get_size() == 2);
+
+ // add stuff to das, should go to c1
+ das.container_name("c1");
+ AttrTable *v1 = new AttrTable;
+ das.add_table("v1", v1);
+ v1->append_attr("v1a1", "String", "v1a1val");
+ v1->append_attr("v1a2", "String", "v1a2val");
+ v1->append_attr("v1a3", "String", "v1a3val");
+ v1->append_attr("v1a4", "String", "v1a4val");
+ AttrTable *v1v1 = v1->append_container("v1v1");
+ v1v1->append_attr("v1v1a1", "String", "v1v1a1val");
+ v1v1->append_attr("v1v1a2", "String", "v1v1a2val");
+
+ // check container and das size
+ CPPUNIT_ASSERT(das.get_size() == 1);
+ das.container_name("");
+ CPPUNIT_ASSERT(das.get_size() == 2);
+
+ // add stuff to das, should go to c2
+ das.container_name("c2");
+ AttrTable *v2 = new AttrTable;
+ das.add_table("v2", v2);
+ v2->append_attr("v2a1", "String", "v2a1val");
+ v2->append_attr("v2a2", "String", "v2a2val");
+ AttrTable *v3 = new AttrTable;
+ das.add_table("v3", v3);
+ v3->append_attr("v3a1", "String", "v3a1val");
+ v3->append_attr("v3a2", "String", "v3a2val");
+ AttrTable *v3v1 = v3->append_container("v3v1");
+ v3v1->append_attr("v3v1a1", "String", "v3v1a1val");
+
+ // check container and das size
+ CPPUNIT_ASSERT(das.get_size() == 2);
+ das.container_name("");
+ CPPUNIT_ASSERT(das.get_size() == 2);
+
+ // print to stream and compare results
+ ostringstream strm;
+ das.print(strm);
+ cout << strm.str() << endl;
+ cout << dprint << endl;
+ CPPUNIT_ASSERT(strm.str() == dprint);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( dasT ) ;
+CPPUNIT_TEST_SUITE_REGISTRATION (dasT);
/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
-int main( int, char ** )
+int main(int argc, char*argv[])
{
- CppUnit::TextUi::TestRunner runner ;
- CppUnit::TestFactoryRegistry ®istry =
- CppUnit::TestFactoryRegistry::getRegistry() ;
- runner.addTest( registry.makeTest() ) ;
- runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(
- &runner.result(),
- std::cerr ) );
- bool wasSuccessful = runner.run( "", false ) ;
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = true; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: dasT has the following tests:" << endl;
+ const std::vector<Test*> &tests = dasT::suite()->getTests();
+ unsigned int prefix_len = dasT::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = dasT::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+
return wasSuccessful ? 0 : 1;
}
-
diff --git a/unit-tests/dds-testsuite/3B42.980909.5.HDF.dmr b/unit-tests/dds-testsuite/3B42.980909.5.HDF.dmr
deleted file mode 100644
index 33074a2..0000000
--- a/unit-tests/dds-testsuite/3B42.980909.5.HDF.dmr
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="3B42.980909.5.HDF">
- <Dimension name="scan" size="1"/>
- <Dimension name="longitude" size="360"/>
- <Dimension name="latitude" size="80"/>
- <Structure name="DATA_GRANULE">
- <Structure name="PlanetaryGrid">
- <Float32 name="percipitate">
- <Dim name="/scan"/>
- <Dim name="/longitude"/>
- <Dim name="/latitude"/>
- </Float32>
- <Float32 name="relError">
- <Dim name="/scan"/>
- <Dim name="/longitude"/>
- <Dim name="/latitude"/>
- </Float32>
- </Structure>
- </Structure>
-</Dataset>
diff --git a/unit-tests/dds-testsuite/3B42.980909.5.hacked.2.HDF.attr.dmr b/unit-tests/dds-testsuite/3B42.980909.5.hacked.2.HDF.attr.dmr
deleted file mode 100644
index 405355d..0000000
--- a/unit-tests/dds-testsuite/3B42.980909.5.hacked.2.HDF.attr.dmr
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="3B42.980909.5.HDF">
- <Dimension name="scan" size="1"/>
- <Dimension name="longitude" size="360"/>
- <Dimension name="latitude" size="80"/>
- <Structure name="DATA_GRANULE">
- <Structure name="PlanetaryGrid">
- <Float32 name="percipitate">
- <Dim name="/scan"/>
- <Dim name="/longitude"/>
- <Dim name="/latitude"/>
- </Float32>
- <Float32 name="relError">
- <Dim name="/scan"/>
- <Dim name="/longitude"/>
- <Dim name="/latitude"/>
- </Float32>
- </Structure>
- </Structure>
- <Attribute name="HDF_GLOBAL" type="Container"/>
- <Attribute name="CoreMetadata" type="Container">
- <Attribute name="OrbitNumber" type="Container">
- <Attribute name="Value" type="Int32">
- <Value>-9999</Value>
- </Attribute>
- <Attribute name="Data_Location" type="String">
- <Value>PGE</Value>
- </Attribute>
- <Attribute name="Mandatory" type="String">
- <Value>FALSE</Value>
- </Attribute>
- </Attribute>
- <Attribute name="RangeBeginningDate" type="Container">
- <Attribute name="Value" type="String">
- <Value>1998/09/09</Value>
- </Attribute>
- <Attribute name="Data_Location" type="String">
- <Value>PGE</Value>
- </Attribute>
- <Attribute name="Mandatory" type="String">
- <Value>FALSE</Value>
- </Attribute>
- </Attribute>
- </Attribute>
- <Attribute name="percipitate" type="Container">
- <Attribute name="name" type="String">
- <Value>dim_0_scan</Value>
- <Value>dim_1_longitude</Value>
- <Value>dim_2_latitude</Value>
- </Attribute>
- </Attribute>
- <Attribute name="relError" type="Container">
- <Attribute name="name" type="String">
- <Value>dim_0_scan</Value>
- <Value>dim_1_longitude</Value>
- <Value>dim_2_latitude</Value>
- </Attribute>
- </Attribute>
-</Dataset>
diff --git a/unit-tests/dds-testsuite/S2000415.HDF.dmr b/unit-tests/dds-testsuite/S2000415.HDF.dmr
deleted file mode 100644
index 5a76c4b..0000000
--- a/unit-tests/dds-testsuite/S2000415.HDF.dmr
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="S2000415.HDF">
- <Dimension name="row" size="458"/>
- <Dimension name="WVC" size="24"/>
- <Dimension name="position" size="4"/>
- <Structure name="NSCAT Rev 20">
- <Int16 name="WVC_Lat">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </Int16>
- <UInt16 name="WVC_Lon">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </UInt16>
- <Byte name="Num_Sigma0">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </Byte>
- <Byte name="Num_Beam_12">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </Byte>
- <Byte name="Num_Beam_34">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </Byte>
- <Byte name="Num_Beam_56">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </Byte>
- <Byte name="Num_Beam_78">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </Byte>
- <Byte name="WVC_Quality_Flag">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </Byte>
- <UInt16 name="Mean_Wind">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </UInt16>
- <UInt16 name="Wind_Speed">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- <Dim name="/position"/>
- </UInt16>
- <UInt16 name="Wind_Dir">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- <Dim name="/position"/>
- </UInt16>
- <UInt16 name="Error_Speed">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- <Dim name="/position"/>
- </UInt16>
- <UInt16 name="Error_Dir">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- <Dim name="/position"/>
- </UInt16>
- <Int16 name="MLE_Likelihood">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- <Dim name="/position"/>
- </Int16>
- <Byte name="Num_Ambigs">
- <Dim name="/row"/>
- <Dim name="/WVC"/>
- </Byte>
- <Sequence name="SwathIndex">
- <Structure name="begin">
- <Int16 name="begin__0"/>
- </Structure>
- </Sequence>
- <Sequence name="NSCAT L2">
- <Structure name="Mean_Time">
- <String name="Mean_Time__0"/>
- </Structure>
- <Structure name="Low_Wind_Speed_Flag">
- <UInt32 name="Low_Wind_Speed_Flag__0"/>
- </Structure>
- <Structure name="High_Wind_Speed_Flag">
- <UInt32 name="High_Wind_Speed_Flag__0"/>
- </Structure>
- </Sequence>
- </Structure>
-</Dataset>
diff --git a/unit-tests/dds-testsuite/coads_climatology.nc.dmr b/unit-tests/dds-testsuite/coads_climatology.nc.dmr
deleted file mode 100644
index 6a9ba3b..0000000
--- a/unit-tests/dds-testsuite/coads_climatology.nc.dmr
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="coads_climatology.nc">
- <Dimension name="TIME" size="12"/>
- <Dimension name="COADSY" size="90"/>
- <Dimension name="COADSX" size="180"/>
- <Float64 name="TIME">
- <Dim name="/TIME"/>
- </Float64>
- <Float64 name="COADSY">
- <Dim name="/COADSY"/>
- </Float64>
- <Float64 name="COADSX">
- <Dim name="/COADSX"/>
- </Float64>
- <Float32 name="SST">
- <Dim name="/TIME"/>
- <Dim name="/COADSY"/>
- <Dim name="/COADSX"/>
- <Map name="TIME"/>
- <Map name="COADSY"/>
- <Map name="COADSX"/>
- </Float32>
- <Float32 name="AIRT">
- <Dim name="/TIME"/>
- <Dim name="/COADSY"/>
- <Dim name="/COADSX"/>
- <Map name="TIME"/>
- <Map name="COADSY"/>
- <Map name="COADSX"/>
- </Float32>
- <Float32 name="UWND">
- <Dim name="/TIME"/>
- <Dim name="/COADSY"/>
- <Dim name="/COADSX"/>
- <Map name="TIME"/>
- <Map name="COADSY"/>
- <Map name="COADSX"/>
- </Float32>
- <Float32 name="VWND">
- <Dim name="/TIME"/>
- <Dim name="/COADSY"/>
- <Dim name="/COADSX"/>
- <Map name="TIME"/>
- <Map name="COADSY"/>
- <Map name="COADSX"/>
- </Float32>
-</Dataset>
diff --git a/unit-tests/dds-testsuite/fnoc1.nc.dmr b/unit-tests/dds-testsuite/fnoc1.nc.dmr
deleted file mode 100644
index ba7a9b5..0000000
--- a/unit-tests/dds-testsuite/fnoc1.nc.dmr
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="fnoc1.nc">
- <Dimension name="time_a" size="16"/>
- <Dimension name="lat" size="17"/>
- <Dimension name="lon" size="21"/>
- <Dimension name="time" size="16"/>
- <Int16 name="u">
- <Dim name="/time_a"/>
- <Dim name="/lat"/>
- <Dim name="/lon"/>
- </Int16>
- <Int16 name="v">
- <Dim name="/time_a"/>
- <Dim name="/lat"/>
- <Dim name="/lon"/>
- </Int16>
- <Float32 name="lat">
- <Dim name="/lat"/>
- </Float32>
- <Float32 name="lon">
- <Dim name="/lon"/>
- </Float32>
- <Float32 name="time">
- <Dim name="/time"/>
- </Float32>
-</Dataset>
diff --git a/unit-tests/dds-testsuite/test.1.attr.dmr b/unit-tests/dds-testsuite/test.1.attr.dmr
deleted file mode 100644
index 770502c..0000000
--- a/unit-tests/dds-testsuite/test.1.attr.dmr
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="data1">
- <Byte name="b">
- <Attribute name="long_name" type="String">
- <Value>byte_b</Value>
- </Attribute>
- </Byte>
- <Int32 name="i">
- <Attribute name="long_name" type="String">
- <Value>int32_i</Value>
- </Attribute>
- <Attribute name="scale_factor" type="Float32">
- <Value>1.2</Value>
- </Attribute>
- <Attribute name="coefs" type="Int32">
- <Value>2</Value>
- <Value>3</Value>
- <Value>4</Value>
- </Attribute>
- </Int32>
- <Int32 name="j"/>
-</Dataset>
diff --git a/unit-tests/dds-testsuite/test.1.dmr b/unit-tests/dds-testsuite/test.1.dmr
deleted file mode 100644
index dab4ae2..0000000
--- a/unit-tests/dds-testsuite/test.1.dmr
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="data1">
- <Byte name="b"/>
- <Int32 name="i"/>
- <Int32 name="j"/>
-</Dataset>
diff --git a/unit-tests/ddsT.cc b/unit-tests/ddsT.cc
index e4bdb27..05b1db6 100644
--- a/unit-tests/ddsT.cc
+++ b/unit-tests/ddsT.cc
@@ -1,4 +1,3 @@
-
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -37,13 +36,18 @@
#include "debug.h"
#include "testFile.h"
+#include "GetOpt.h"
+using namespace CppUnit;
using namespace std;
using namespace libdap;
+static bool debug = false;
+
int test_variable_sleep_interval = 0; // Used in Test* classes for testing
- // timeouts.
-string cprint = "\
+// timeouts.
+string cprint =
+ "\
Dataset {\n\
Int16 var1;\n\
String var6;\n\
@@ -54,7 +58,7 @@ Dataset {\n\
} var9;\n\
} var8;\n\
} Test%20Data%20Set;\n\
-" ;
+";
string pprint = "\
Dataset {\n\
@@ -62,14 +66,15 @@ Dataset {\n\
String var6;\n\
Int16 var7;\n\
} Test%20Data%20Set;\n\
-" ;
+";
string nprint = "\
Dataset {\n\
} Test%20Data%20Set;\n\
-" ;
+";
-string containerprint = "\
+string containerprint =
+ "\
Dataset {\n\
Structure {\n\
Int16 c1var1;\n\
@@ -87,15 +92,13 @@ Dataset {\n\
Byte var1;\n\
Float64 var2;\n\
} TestDDS;\n\
-" ;
-
+";
-class ddsT : public CppUnit::TestFixture {
+class ddsT: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE( ddsT ) ;
-CPPUNIT_TEST( ddsT_test ) ;
-CPPUNIT_TEST( ddsT_containers ) ;
-CPPUNIT_TEST_SUITE_END( ) ;
+ CPPUNIT_TEST_SUITE (ddsT);
+ CPPUNIT_TEST (ddsT_test);
+ CPPUNIT_TEST (ddsT_containers);CPPUNIT_TEST_SUITE_END( );
private:
/* TEST PRIVATE DATA */
@@ -109,527 +112,528 @@ public:
void tearDown()
{
- delete factory; factory = 0;
+ delete factory;
+ factory = 0;
}
void ddsT_test()
{
- DDS dds( factory, "TestDDS" ) ;
-
- string dsn = dds.get_dataset_name() ;
- CPPUNIT_ASSERT( dsn == "TestDDS" ) ;
-
- dds.set_dataset_name( "Test Data Set" ) ;
- dsn = dds.get_dataset_name() ;
- CPPUNIT_ASSERT( dsn == "Test Data Set" ) ;
-
- string fn = dds.filename() ;
- CPPUNIT_ASSERT( fn == "" ) ;
-
- dds.filename( "dds_test.data" ) ;
- fn = dds.filename() ;
- CPPUNIT_ASSERT( fn == "dds_test.data" ) ;
-
- try
- {
- dds.add_var( (BaseType *)NULL ) ;
- CPPUNIT_FAIL( "succeeded in adding a null var" ) ;
- }
- catch( InternalErr &e )
- {
- }
-
- try
- {
- BaseType *bt = factory->NewInt16( "var1" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewInt16( "var2" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewInt16( "var3" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewInt16( "var4" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewInt16( "var5" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewStr( "var6" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- BaseType *tbt = factory->NewInt16( "" ) ;
- bt = factory->NewArray( "var7", tbt ) ;
- delete tbt; tbt = 0;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewStructure( "var8" ) ;
- Structure *s = (Structure *)bt ;
- BaseType *bts1 = factory->NewStructure( "var9" ) ;
- Structure *s1 = (Structure *)bts1 ;
- BaseType *bts2 = factory->NewInt16( "var10" ) ;
- s1->add_var( bts2 ) ;
- delete bts2 ; bts2 = 0 ;
- s->add_var( bts1 ) ;
- delete bts1 ; bts1 = 0 ;
- dds.add_var( bt ) ;
- delete bt; bt = 0;
- }
- catch( InternalErr &e )
- {
- CPPUNIT_FAIL( "failed to add a var" ) ;
- }
-
- int nv = dds.num_var() ;
- CPPUNIT_ASSERT( nv == 8 ) ;
-
- vector<string> vs ;
- typedef std::vector<string>::const_iterator vs_citer ;
- typedef std::vector<string>::iterator vs_iter ;
- vs.push_back( "var1" ) ;
- vs.push_back( "var2" ) ;
- vs.push_back( "var3" ) ;
- vs.push_back( "var4" ) ;
- vs.push_back( "var5" ) ;
- vs.push_back( "var6" ) ;
- vs.push_back( "var7" ) ;
- vs.push_back( "var8" ) ;
-
- DDS::Vars_iter dvsc = dds.var_begin() ;
- vs_citer vsc = vs.begin() ;
- for( ; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++ )
- {
- CPPUNIT_ASSERT( (*dvsc)->name() == *vsc ) ;
- }
- CPPUNIT_ASSERT( dvsc == dds.var_end() && vsc == vs.end() ) ;
- if( dvsc != dds.var_end() && vsc == vs.end() )
- {
- CPPUNIT_FAIL( "Too many vars" ) ;
- }
- else if( dvsc == dds.var_end() && vsc != vs.end() )
- {
- CPPUNIT_FAIL( "Too few vars" ) ;
- }
-
- for( vsc = vs.begin(); vsc != vs.end(); vsc++ )
- {
- if( *vsc == "var2" )
- {
- vs_iter &vsi = (vs_iter &)vsc ;
- vs.erase( vsi ) ;
- break ;
- }
- }
-
- dvsc = dds.var_begin() ;
- vsc = vs.begin() ;
- for( ; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++ )
- {
- if( (*dvsc)->name() == "var2" )
- {
- DDS::Vars_iter &dvsi = (DDS::Vars_iter &)dvsc ;
- dds.del_var( dvsi ) ;
+ DDS dds(factory, "TestDDS");
+
+ string dsn = dds.get_dataset_name();
+ CPPUNIT_ASSERT(dsn == "TestDDS");
+
+ dds.set_dataset_name("Test Data Set");
+ dsn = dds.get_dataset_name();
+ CPPUNIT_ASSERT(dsn == "Test Data Set");
+
+ string fn = dds.filename();
+ CPPUNIT_ASSERT(fn == "");
+
+ dds.filename("dds_test.data");
+ fn = dds.filename();
+ CPPUNIT_ASSERT(fn == "dds_test.data");
+
+ try {
+ dds.add_var((BaseType *) NULL);
+ CPPUNIT_FAIL("succeeded in adding a null var");
+ }
+ catch (InternalErr &e) {
+ }
+
+ try {
+ BaseType *bt = factory->NewInt16("var1");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewInt16("var2");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewInt16("var3");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewInt16("var4");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewInt16("var5");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewStr("var6");
+ dds.add_var(bt);
+ delete bt;
+ BaseType *tbt = factory->NewInt16("");
+ bt = factory->NewArray("var7", tbt);
+ delete tbt;
+ tbt = 0;
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewStructure("var8");
+ Structure *s = (Structure *) bt;
+ BaseType *bts1 = factory->NewStructure("var9");
+ Structure *s1 = (Structure *) bts1;
+ BaseType *bts2 = factory->NewInt16("var10");
+ s1->add_var(bts2);
+ delete bts2;
+ bts2 = 0;
+ s->add_var(bts1);
+ delete bts1;
+ bts1 = 0;
+ dds.add_var(bt);
+ delete bt;
+ bt = 0;
+ }
+ catch (InternalErr &e) {
+ CPPUNIT_FAIL("failed to add a var");
+ }
+
+ int nv = dds.num_var();
+ CPPUNIT_ASSERT(nv == 8);
+
+ vector<string> vs;
+ typedef std::vector<string>::const_iterator vs_citer;
+ typedef std::vector<string>::iterator vs_iter;
+ vs.push_back("var1");
+ vs.push_back("var2");
+ vs.push_back("var3");
+ vs.push_back("var4");
+ vs.push_back("var5");
+ vs.push_back("var6");
+ vs.push_back("var7");
+ vs.push_back("var8");
+
+ DDS::Vars_iter dvsc = dds.var_begin();
+ vs_citer vsc = vs.begin();
+ for (; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++) {
+ CPPUNIT_ASSERT((*dvsc)->name() == *vsc);
+ }
+ CPPUNIT_ASSERT(dvsc == dds.var_end() && vsc == vs.end());
+ if (dvsc != dds.var_end() && vsc == vs.end()) {
+ CPPUNIT_FAIL("Too many vars");
+ }
+ else if (dvsc == dds.var_end() && vsc != vs.end()) {
+ CPPUNIT_FAIL("Too few vars");
+ }
+
+ for (vsc = vs.begin(); vsc != vs.end(); vsc++) {
+ if (*vsc == "var2") {
+ vs_iter &vsi = (vs_iter &) vsc;
+ vs.erase(vsi);
+ break;
+ }
+ }
+
+ dvsc = dds.var_begin();
+ vsc = vs.begin();
+ for (; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++) {
+ if ((*dvsc)->name() == "var2") {
+ DDS::Vars_iter &dvsi = (DDS::Vars_iter &) dvsc;
+ dds.del_var(dvsi);
+ }
+ CPPUNIT_ASSERT((*dvsc)->name() == *vsc);
+ }
+
+ nv = dds.num_var();
+ CPPUNIT_ASSERT(nv == 7);
+ if (nv != 7) {
+ for (dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++) {
+ DBG2( cerr << " " << (*dvsc)->name() << endl ) ;
+ }
+ }
+
+ for (vsc = vs.begin(); vsc != vs.end(); vsc++) {
+ if (*vsc == "var3") {
+ vs_iter &vsi = (vs_iter &) vsc;
+ vs.erase(vsi);
+ break;
+ }
+ }
+ dvsc = dds.var_begin();
+ vsc = vs.begin();
+ for (; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++) {
+ if ((*dvsc)->name() == "var3") {
+ DDS::Vars_iter &dvsi = (DDS::Vars_iter &) dvsc;
+ dds.del_var(dvsi);
}
- CPPUNIT_ASSERT( (*dvsc)->name() == *vsc ) ;
- }
-
- nv = dds.num_var() ;
- CPPUNIT_ASSERT( nv == 7 ) ;
- if( nv != 7 )
- {
- for( dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++ )
- {
- DBG2( cerr << " " << (*dvsc)->name() << endl ) ;
- }
- }
-
- for( vsc = vs.begin(); vsc != vs.end(); vsc++ )
- {
- if( *vsc == "var3" )
- {
- vs_iter &vsi = (vs_iter &)vsc ;
- vs.erase( vsi ) ;
- break ;
- }
- }
- dvsc = dds.var_begin() ;
- vsc = vs.begin() ;
- for( ; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++ )
- {
- if( (*dvsc)->name() == "var3" )
- {
- DDS::Vars_iter &dvsi = (DDS::Vars_iter &)dvsc ;
- dds.del_var( dvsi ) ;
- }
- CPPUNIT_ASSERT( (*dvsc)->name() == *vsc ) ;
- }
-
- nv = dds.num_var() ;
- CPPUNIT_ASSERT( nv == 6 ) ;
- if( nv != 6 )
- {
- for( dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++ )
- {
- DBG2( cerr << " " << (*dvsc)->name() << endl ) ;
- }
- }
-
- for( vsc = vs.begin(); vsc != vs.end(); vsc++ )
- {
- if( *vsc == "var4" )
- {
- vs_citer vsc2 = vsc ;
- vsc2++ ;
- vsc2++ ;
- vs_iter &vsi = (vs_iter &)vsc ;
- vs_iter &vsi2 = (vs_iter &)vsc2 ;
- vs.erase( vsi, vsi2 ) ;
- break ;
- }
- }
- dvsc = dds.var_begin() ;
- vsc = vs.begin() ;
- for( ; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++ )
- {
- if( (*dvsc)->name() == "var4" )
- {
- DDS::Vars_iter dvsc2 = dvsc ;
- dvsc2++ ;
- dvsc2++ ;
- DDS::Vars_iter &dvsi = (DDS::Vars_iter &)dvsc ;
- DDS::Vars_iter &dvsi2 = (DDS::Vars_iter &)dvsc2 ;
- dds.del_var( dvsi, dvsi2 ) ;
- }
- CPPUNIT_ASSERT( (*dvsc)->name() == *vsc ) ;
- }
-
- nv = dds.num_var() ;
- CPPUNIT_ASSERT( nv == 4 ) ;
- if( nv != 4 )
- {
- for( dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++ )
- {
- DBG2( cerr << " " << (*dvsc)->name() << endl ) ;
- }
- }
-
- BaseType *bt = dds.var( "varnot" ) ;
- CPPUNIT_ASSERT( !bt ) ;
-
- bt = dds.var( "var6" ) ;
- CPPUNIT_ASSERT( bt ) ;
- if( bt )
- {
- CPPUNIT_ASSERT( bt->name() == "var6" ) ;
- }
-
- string find_var = "var6" ;
- bt = dds.var( find_var ) ;
- CPPUNIT_ASSERT( bt ) ;
- if( bt )
- {
- CPPUNIT_ASSERT( bt->name() == "var6" ) ;
- }
-
- find_var = "var10" ;
- bt = dds.var( find_var ) ;
- CPPUNIT_ASSERT( bt ) ;
- if( bt )
- {
- CPPUNIT_ASSERT( bt->name() == "var10" ) ;
- }
-
- find_var = "var10" ;
- BaseType::btp_stack btps ;
- bt = dds.var( find_var, &btps ) ;
- CPPUNIT_ASSERT( bt ) ;
- if( bt )
- {
- CPPUNIT_ASSERT( bt->name() == "var10" ) ;
- if( bt->name() == "var10" )
- {
- CPPUNIT_ASSERT( btps.size() == 2 ) ;
- if( btps.size() == 2 )
- {
- CPPUNIT_ASSERT( btps.top()->name() == "var8" ) ;
- btps.pop() ;
- CPPUNIT_ASSERT( btps.top()->name() == "var9" ) ;
- btps.pop() ;
- }
- }
- }
-
- find_var = "var8.var9.var10" ;
- bt = dds.var( find_var, &btps ) ;
- CPPUNIT_ASSERT( bt ) ;
- if( bt )
- {
- CPPUNIT_ASSERT( bt->name() == "var10" ) ;
- if( bt->name() == "var10" )
- {
- CPPUNIT_ASSERT( btps.size() == 2 ) ;
- if( btps.size() == 2 )
- {
- CPPUNIT_ASSERT( btps.top()->name() == "var9" ) ;
- btps.pop() ;
- CPPUNIT_ASSERT( btps.top()->name() == "var8" ) ;
- btps.pop() ;
- }
- }
- }
-
- {
+ CPPUNIT_ASSERT((*dvsc)->name() == *vsc);
+ }
+
+ nv = dds.num_var();
+ CPPUNIT_ASSERT(nv == 6);
+ if (nv != 6) {
+ for (dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++) {
+ DBG2( cerr << " " << (*dvsc)->name() << endl ) ;
+ }
+ }
+
+ for (vsc = vs.begin(); vsc != vs.end(); vsc++) {
+ if (*vsc == "var4") {
+ vs_citer vsc2 = vsc;
+ vsc2++;
+ vsc2++;
+ vs_iter &vsi = (vs_iter &) vsc;
+ vs_iter &vsi2 = (vs_iter &) vsc2;
+ vs.erase(vsi, vsi2);
+ break;
+ }
+ }
+ dvsc = dds.var_begin();
+ vsc = vs.begin();
+ for (; dvsc != dds.var_end() && vsc != vs.end(); dvsc++, vsc++) {
+ if ((*dvsc)->name() == "var4") {
+ DDS::Vars_iter dvsc2 = dvsc;
+ dvsc2++;
+ dvsc2++;
+ DDS::Vars_iter &dvsi = (DDS::Vars_iter &) dvsc;
+ DDS::Vars_iter &dvsi2 = (DDS::Vars_iter &) dvsc2;
+ dds.del_var(dvsi, dvsi2);
+ }
+ CPPUNIT_ASSERT((*dvsc)->name() == *vsc);
+ }
+
+ nv = dds.num_var();
+ CPPUNIT_ASSERT(nv == 4);
+ if (nv != 4) {
+ for (dvsc = dds.var_begin(); dvsc != dds.var_end(); dvsc++) {
+ DBG2( cerr << " " << (*dvsc)->name() << endl ) ;
+ }
+ }
+
+ BaseType *bt = dds.var("varnot");
+ CPPUNIT_ASSERT(!bt);
+
+ bt = dds.var("var6");
+ CPPUNIT_ASSERT(bt);
+ if (bt) {
+ CPPUNIT_ASSERT(bt->name() == "var6");
+ }
+
+ string find_var = "var6";
+ bt = dds.var(find_var);
+ CPPUNIT_ASSERT(bt);
+ if (bt) {
+ CPPUNIT_ASSERT(bt->name() == "var6");
+ }
+
+ find_var = "var10";
+ bt = dds.var(find_var);
+ CPPUNIT_ASSERT(bt);
+ if (bt) {
+ CPPUNIT_ASSERT(bt->name() == "var10");
+ }
+
+ find_var = "var10";
+ BaseType::btp_stack btps;
+ bt = dds.var(find_var, &btps);
+ CPPUNIT_ASSERT(bt);
+ if (bt) {
+ CPPUNIT_ASSERT(bt->name() == "var10");
+ if (bt->name() == "var10") {
+ CPPUNIT_ASSERT(btps.size() == 2);
+ if (btps.size() == 2) {
+ CPPUNIT_ASSERT(btps.top()->name() == "var8");
+ btps.pop();
+ CPPUNIT_ASSERT(btps.top()->name() == "var9");
+ btps.pop();
+ }
+ }
+ }
+
+ find_var = "var8.var9.var10";
+ bt = dds.var(find_var, &btps);
+ CPPUNIT_ASSERT(bt);
+ if (bt) {
+ CPPUNIT_ASSERT(bt->name() == "var10");
+ if (bt->name() == "var10") {
+ CPPUNIT_ASSERT(btps.size() == 2);
+ if (btps.size() == 2) {
+ CPPUNIT_ASSERT(btps.top()->name() == "var9");
+ btps.pop();
+ CPPUNIT_ASSERT(btps.top()->name() == "var8");
+ btps.pop();
+ }
+ }
+ }
+
+ {
ostringstream sof;
- dds.print( sof );
+ dds.print(sof);
CPPUNIT_ASSERT(sof.str().find(cprint) != string::npos);
- }
+ }
- {
+ {
ostringstream sof;
- dds.print_constrained( sof );
+ dds.print_constrained(sof);
CPPUNIT_ASSERT(sof.str().find(nprint) != string::npos);
- }
+ }
- dds.mark_all( true ) ;
+ dds.mark_all(true);
- {
+ {
ostringstream sof;
- dds.print_constrained( sof );
+ dds.print_constrained(sof);
CPPUNIT_ASSERT(sof.str().find(cprint) != string::npos);
- }
+ }
- bool mark_ret = dds.mark( "var8", false ) ;
- CPPUNIT_ASSERT( mark_ret == true ) ;
+ bool mark_ret = dds.mark("var8", false);
+ CPPUNIT_ASSERT(mark_ret == true);
- {
+ {
ostringstream sof;
- dds.print_constrained( sof );
+ dds.print_constrained(sof);
CPPUNIT_ASSERT(sof.str().find(pprint) != string::npos);
- }
+ }
}
void ddsT_containers()
{
- DDS dds( factory, "TestDDS" ) ;
-
- // set the container to c1 and make sure the container is created
- dds.container_name( "c1" ) ;
- CPPUNIT_ASSERT( dds.container_name() == "c1" ) ;
-
- Structure *c1 = dds.container() ;
- CPPUNIT_ASSERT( c1 ) ;
- CPPUNIT_ASSERT( c1->name() == "c1" ) ;
-
- CPPUNIT_ASSERT( dds.num_var() == 1 ) ;
-
- // set the container to c2 and make sure the container is created
- dds.container_name( "c2" ) ;
- CPPUNIT_ASSERT( dds.container_name() == "c2" ) ;
-
- Structure *c2 = dds.container() ;
- CPPUNIT_ASSERT( c2 ) ;
- CPPUNIT_ASSERT( c2->name() == "c2" ) ;
-
- CPPUNIT_ASSERT( dds.num_var() == 2 ) ;
-
- // set back to c1, make sure new one not created
- dds.container_name( "c1" ) ;
- CPPUNIT_ASSERT( dds.container_name() == "c1" ) ;
-
- c1 = dds.container() ;
- CPPUNIT_ASSERT( c1 ) ;
- CPPUNIT_ASSERT( c1->name() == "c1" ) ;
-
- CPPUNIT_ASSERT( dds.num_var() == 2 ) ;
-
- // start adding variables and make sure not added directly to dds.
- // Make sure can find those variables without referencing the
- // container.
- try
- {
- BaseType *bt = factory->NewInt16( "c1var1" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewStr( "c1var2" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- BaseType *tbt = factory->NewInt16( "" );
- bt = factory->NewArray( "c1var3", tbt ) ;
- delete tbt; tbt = 0;
- dds.add_var( bt ) ;
- delete bt ;
- }
- catch( InternalErr &e )
- {
- CPPUNIT_FAIL( "failed to add a var" ) ;
- }
- CPPUNIT_ASSERT( dds.num_var() == 2 ) ;
- CPPUNIT_ASSERT( c1->element_count() == 3 ) ;
-
- BaseType *bt = dds.var( "c1var1" ) ;
- CPPUNIT_ASSERT( bt ) ;
- CPPUNIT_ASSERT( bt->name() == "c1var1" ) ;
- Int16 *ibt = dynamic_cast<Int16 *>(bt) ;
- CPPUNIT_ASSERT( ibt ) ;
-
- bt = dds.var( "c1var2" ) ;
- CPPUNIT_ASSERT( bt ) ;
- CPPUNIT_ASSERT( bt->name() == "c1var2" ) ;
- Str *strbt = dynamic_cast<Str *>(bt) ;
- CPPUNIT_ASSERT( strbt ) ;
-
- dds.del_var( "c1var2" ) ;
- bt = dds.var( "c1var2" ) ;
- CPPUNIT_ASSERT( bt == 0 ) ;
- CPPUNIT_ASSERT( dds.num_var() == 2 ) ;
- CPPUNIT_ASSERT( c1->element_count() == 2 ) ;
-
- // set container to "", add vars, make sure added directly to dds.
- // Make sure can find those variables
- dds.container_name( "" ) ;
- CPPUNIT_ASSERT( dds.container_name() == "" ) ;
- CPPUNIT_ASSERT( dds.container() == 0 ) ;
- try
- {
- BaseType *bt = factory->NewByte( "var1" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewFloat64( "var2" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewUInt32( "var3" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- }
- catch( InternalErr &e )
- {
- CPPUNIT_FAIL( "failed to add a var" ) ;
- }
- CPPUNIT_ASSERT( dds.num_var() == 5 ) ;
- CPPUNIT_ASSERT( c1->element_count() == 2 ) ;
-
- BaseType::btp_stack btps ;
- bt = dds.var( "c1var1", btps ) ;
- CPPUNIT_ASSERT( bt && bt->name() == "c1var1" ) ;
- CPPUNIT_ASSERT( btps.size() == 1 ) ;
- BaseType *btp = btps.top() ;
- CPPUNIT_ASSERT( btp && btp->name() == "c1" ) ;
- btps.pop() ;
-
- bt = dds.var( "var1" ) ;
- CPPUNIT_ASSERT( bt ) ;
- CPPUNIT_ASSERT( bt->name() == "var1" ) ;
- Byte *bbt = dynamic_cast<Byte *>(bt) ;
- CPPUNIT_ASSERT( bbt ) ;
-
- bt = c1->var( "var1" ) ;
- CPPUNIT_ASSERT( bt == 0 ) ;
-
- dds.del_var( "var3" ) ;
- bt = dds.var( "var3" ) ;
- CPPUNIT_ASSERT( bt == 0 ) ;
- CPPUNIT_ASSERT( dds.num_var() == 4 ) ;
- CPPUNIT_ASSERT( c1->element_count() == 2 ) ;
-
- // set to c2, add variables and make sure not added directly to dds.
- // Make sure can find those variables without referencing the
- // container.
- dds.container_name( "c2" ) ;
- CPPUNIT_ASSERT( dds.container_name() == "c2" ) ;
- c2 = dds.container() ;
- CPPUNIT_ASSERT( c2 && c2->name() == "c2" ) ;
-
- try
- {
- BaseType *bt = factory->NewInt32( "c2var1" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- bt = factory->NewStr( "c2var2" ) ;
- dds.add_var( bt ) ;
- delete bt ;
- Structure *s = factory->NewStructure( "c2var3" ) ;
- Structure *s1 = factory->NewStructure( "c2var3var1" ) ;
- bt = factory->NewInt16( "c2var3var1var1" ) ;
- s1->add_var( bt ) ;
- delete bt ; bt = 0 ;
- bt = factory->NewInt16( "c2var3var1var2" ) ;
- s1->add_var( bt ) ;
- delete bt ; bt = 0 ;
- s->add_var( s1 ) ;
- delete s1 ; s1 = 0 ;
- dds.add_var( s ) ;
- delete s ; s = 0 ;
- }
- catch( InternalErr &e )
- {
- CPPUNIT_FAIL( "failed to add a var" ) ;
- }
- CPPUNIT_ASSERT( dds.num_var() == 4 ) ;
- CPPUNIT_ASSERT( c2->element_count() == 3 ) ;
-
- bt = dds.var( "c2var1" ) ;
- CPPUNIT_ASSERT( bt && bt->name() == "c2var1" ) ;
- Int32 *i32bt = dynamic_cast<Int32 *>( bt ) ;
- CPPUNIT_ASSERT( i32bt ) ;
-
- bt = dds.var( "c2var2" ) ;
- CPPUNIT_ASSERT( bt && bt->name() == "c2var2" ) ;
- strbt = dynamic_cast<Str *>( bt ) ;
- CPPUNIT_ASSERT( strbt ) ;
-
- bt = dds.var( "c2var3" ) ;
- CPPUNIT_ASSERT( bt && bt->name() == "c2var3" ) ;
- Structure *sbt = dynamic_cast<Structure *>( bt ) ;
- CPPUNIT_ASSERT( sbt ) ;
-
- bt = dds.var( "var1" ) ;
- CPPUNIT_ASSERT( bt == 0 ) ;
-
- bt = dds.var( "var2" ) ;
- CPPUNIT_ASSERT( bt == 0 ) ;
-
- bt = dds.var( "c2var3var1var2", btps ) ;
- CPPUNIT_ASSERT( bt && bt->name() == "c2var3var1var2" ) ;
- CPPUNIT_ASSERT( btps.size() == 3 ) ;
- btp = btps.top() ;
- CPPUNIT_ASSERT( btp && btp->name() == "c2" ) ;
- btps.pop() ;
- btp = btps.top() ;
- CPPUNIT_ASSERT( btp && btp->name() == "c2var3" ) ;
- btps.pop() ;
- btp = btps.top() ;
- CPPUNIT_ASSERT( btp && btp->name() == "c2var3var1" ) ;
- btps.pop() ;
-
- dds.del_var( "c2var1" ) ;
- bt = dds.var( "c2var1" ) ;
- CPPUNIT_ASSERT( bt == 0 ) ;
- CPPUNIT_ASSERT( dds.num_var() == 4 ) ;
- CPPUNIT_ASSERT( c2->element_count() == 2 ) ;
-
- // print the dds and make sure it looks good.
- ostringstream sstrm ;
- dds.print( sstrm ) ;
- cout << sstrm.str() << endl ;
- CPPUNIT_ASSERT( sstrm.str() == containerprint ) ;
+ DDS dds(factory, "TestDDS");
+
+ // set the container to c1 and make sure the container is created
+ dds.container_name("c1");
+ CPPUNIT_ASSERT(dds.container_name() == "c1");
+
+ Structure *c1 = dds.container();
+ CPPUNIT_ASSERT(c1);
+ CPPUNIT_ASSERT(c1->name() == "c1");
+
+ CPPUNIT_ASSERT(dds.num_var() == 1);
+
+ // set the container to c2 and make sure the container is created
+ dds.container_name("c2");
+ CPPUNIT_ASSERT(dds.container_name() == "c2");
+
+ Structure *c2 = dds.container();
+ CPPUNIT_ASSERT(c2);
+ CPPUNIT_ASSERT(c2->name() == "c2");
+
+ CPPUNIT_ASSERT(dds.num_var() == 2);
+
+ // set back to c1, make sure new one not created
+ dds.container_name("c1");
+ CPPUNIT_ASSERT(dds.container_name() == "c1");
+
+ c1 = dds.container();
+ CPPUNIT_ASSERT(c1);
+ CPPUNIT_ASSERT(c1->name() == "c1");
+
+ CPPUNIT_ASSERT(dds.num_var() == 2);
+
+ // start adding variables and make sure not added directly to dds.
+ // Make sure can find those variables without referencing the
+ // container.
+ try {
+ BaseType *bt = factory->NewInt16("c1var1");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewStr("c1var2");
+ dds.add_var(bt);
+ delete bt;
+ BaseType *tbt = factory->NewInt16("");
+ bt = factory->NewArray("c1var3", tbt);
+ delete tbt;
+ tbt = 0;
+ dds.add_var(bt);
+ delete bt;
+ }
+ catch (InternalErr &e) {
+ CPPUNIT_FAIL("failed to add a var");
+ }
+ CPPUNIT_ASSERT(dds.num_var() == 2);
+ CPPUNIT_ASSERT(c1->element_count() == 3);
+
+ BaseType *bt = dds.var("c1var1");
+ CPPUNIT_ASSERT(bt);
+ CPPUNIT_ASSERT(bt->name() == "c1var1");
+ Int16 *ibt = dynamic_cast<Int16 *>(bt);
+ CPPUNIT_ASSERT(ibt);
+
+ bt = dds.var("c1var2");
+ CPPUNIT_ASSERT(bt);
+ CPPUNIT_ASSERT(bt->name() == "c1var2");
+ Str *strbt = dynamic_cast<Str *>(bt);
+ CPPUNIT_ASSERT(strbt);
+
+ dds.del_var("c1var2");
+ bt = dds.var("c1var2");
+ CPPUNIT_ASSERT(bt == 0);
+ CPPUNIT_ASSERT(dds.num_var() == 2);
+ CPPUNIT_ASSERT(c1->element_count() == 2);
+
+ // set container to "", add vars, make sure added directly to dds.
+ // Make sure can find those variables
+ dds.container_name("");
+ CPPUNIT_ASSERT(dds.container_name() == "");
+ CPPUNIT_ASSERT(dds.container() == 0);
+ try {
+ BaseType *bt = factory->NewByte("var1");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewFloat64("var2");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewUInt32("var3");
+ dds.add_var(bt);
+ delete bt;
+ }
+ catch (InternalErr &e) {
+ CPPUNIT_FAIL("failed to add a var");
+ }
+ CPPUNIT_ASSERT(dds.num_var() == 5);
+ CPPUNIT_ASSERT(c1->element_count() == 2);
+
+ BaseType::btp_stack btps;
+ bt = dds.var("c1var1", btps);
+ CPPUNIT_ASSERT(bt && bt->name() == "c1var1");
+ CPPUNIT_ASSERT(btps.size() == 1);
+ BaseType *btp = btps.top();
+ CPPUNIT_ASSERT(btp && btp->name() == "c1");
+ btps.pop();
+
+ bt = dds.var("var1");
+ CPPUNIT_ASSERT(bt);
+ CPPUNIT_ASSERT(bt->name() == "var1");
+ Byte *bbt = dynamic_cast<Byte *>(bt);
+ CPPUNIT_ASSERT(bbt);
+
+ bt = c1->var("var1");
+ CPPUNIT_ASSERT(bt == 0);
+
+ dds.del_var("var3");
+ bt = dds.var("var3");
+ CPPUNIT_ASSERT(bt == 0);
+ CPPUNIT_ASSERT(dds.num_var() == 4);
+ CPPUNIT_ASSERT(c1->element_count() == 2);
+
+ // set to c2, add variables and make sure not added directly to dds.
+ // Make sure can find those variables without referencing the
+ // container.
+ dds.container_name("c2");
+ CPPUNIT_ASSERT(dds.container_name() == "c2");
+ c2 = dds.container();
+ CPPUNIT_ASSERT(c2 && c2->name() == "c2");
+
+ try {
+ BaseType *bt = factory->NewInt32("c2var1");
+ dds.add_var(bt);
+ delete bt;
+ bt = factory->NewStr("c2var2");
+ dds.add_var(bt);
+ delete bt;
+ Structure *s = factory->NewStructure("c2var3");
+ Structure *s1 = factory->NewStructure("c2var3var1");
+ bt = factory->NewInt16("c2var3var1var1");
+ s1->add_var(bt);
+ delete bt;
+ bt = 0;
+ bt = factory->NewInt16("c2var3var1var2");
+ s1->add_var(bt);
+ delete bt;
+ bt = 0;
+ s->add_var(s1);
+ delete s1;
+ s1 = 0;
+ dds.add_var(s);
+ delete s;
+ s = 0;
+ }
+ catch (InternalErr &e) {
+ CPPUNIT_FAIL("failed to add a var");
+ }
+ CPPUNIT_ASSERT(dds.num_var() == 4);
+ CPPUNIT_ASSERT(c2->element_count() == 3);
+
+ bt = dds.var("c2var1");
+ CPPUNIT_ASSERT(bt && bt->name() == "c2var1");
+ Int32 *i32bt = dynamic_cast<Int32 *>(bt);
+ CPPUNIT_ASSERT(i32bt);
+
+ bt = dds.var("c2var2");
+ CPPUNIT_ASSERT(bt && bt->name() == "c2var2");
+ strbt = dynamic_cast<Str *>(bt);
+ CPPUNIT_ASSERT(strbt);
+
+ bt = dds.var("c2var3");
+ CPPUNIT_ASSERT(bt && bt->name() == "c2var3");
+ Structure *sbt = dynamic_cast<Structure *>(bt);
+ CPPUNIT_ASSERT(sbt);
+
+ bt = dds.var("var1");
+ CPPUNIT_ASSERT(bt == 0);
+
+ bt = dds.var("var2");
+ CPPUNIT_ASSERT(bt == 0);
+
+ bt = dds.var("c2var3var1var2", btps);
+ CPPUNIT_ASSERT(bt && bt->name() == "c2var3var1var2");
+ CPPUNIT_ASSERT(btps.size() == 3);
+ btp = btps.top();
+ CPPUNIT_ASSERT(btp && btp->name() == "c2");
+ btps.pop();
+ btp = btps.top();
+ CPPUNIT_ASSERT(btp && btp->name() == "c2var3");
+ btps.pop();
+ btp = btps.top();
+ CPPUNIT_ASSERT(btp && btp->name() == "c2var3var1");
+ btps.pop();
+
+ dds.del_var("c2var1");
+ bt = dds.var("c2var1");
+ CPPUNIT_ASSERT(bt == 0);
+ CPPUNIT_ASSERT(dds.num_var() == 4);
+ CPPUNIT_ASSERT(c2->element_count() == 2);
+
+ // print the dds and make sure it looks good.
+ ostringstream sstrm;
+ dds.print(sstrm);
+ cout << sstrm.str() << endl;
+ CPPUNIT_ASSERT(sstrm.str() == containerprint);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( ddsT ) ;
+CPPUNIT_TEST_SUITE_REGISTRATION (ddsT);
/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
-int main( int, char ** )
+int main(int argc, char*argv[])
{
- CppUnit::TextUi::TestRunner runner ;
- CppUnit::TestFactoryRegistry ®istry =
- CppUnit::TestFactoryRegistry::getRegistry() ;
- runner.addTest( registry.makeTest() ) ;
- runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(
- &runner.result(),
- std::cerr ) );
- bool wasSuccessful = runner.run( "", false ) ;
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: ddsT has the following tests:" << endl;
+ const std::vector<Test*> &tests = ddsT::suite()->getTests();
+ unsigned int prefix_len = ddsT::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = ddsT::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/generalUtilTest.cc b/unit-tests/generalUtilTest.cc
index a1c3a2d..e9a9658 100644
--- a/unit-tests/generalUtilTest.cc
+++ b/unit-tests/generalUtilTest.cc
@@ -36,6 +36,7 @@
#include <cstring>
#include <string>
+#include "GetOpt.h"
using std::cerr;
using std::endl;
@@ -44,6 +45,8 @@ using std::string;
using namespace CppUnit;
using namespace libdap;
+static bool debug = false;
+
class generalUtilTest: public TestFixture {
private:
@@ -63,25 +66,25 @@ public:
{
}
-CPPUNIT_TEST_SUITE(generalUtilTest);
-
- CPPUNIT_TEST(octal_to_hex_test);
- CPPUNIT_TEST(prune_spaces_test);
- CPPUNIT_TEST(path_to_filename_test);
- CPPUNIT_TEST(hexstring_test);
- CPPUNIT_TEST(unhexstring_test);
- CPPUNIT_TEST(id2www_test);
- CPPUNIT_TEST(www2id_test);
- CPPUNIT_TEST(ce_string_parse_test);
- CPPUNIT_TEST(escattr_test);
- CPPUNIT_TEST(unescattr_test);
- CPPUNIT_TEST(munge_error_message_test);
- CPPUNIT_TEST(id2xml_test);
- CPPUNIT_TEST(xml2id_test);
-
- CPPUNIT_TEST(glob_test_1);
- CPPUNIT_TEST(glob_test_2);
- CPPUNIT_TEST(glob_test_3);
+ CPPUNIT_TEST_SUITE (generalUtilTest);
+
+ CPPUNIT_TEST (octal_to_hex_test);
+ CPPUNIT_TEST (prune_spaces_test);
+ CPPUNIT_TEST (path_to_filename_test);
+ CPPUNIT_TEST (hexstring_test);
+ CPPUNIT_TEST (unhexstring_test);
+ CPPUNIT_TEST (id2www_test);
+ CPPUNIT_TEST (www2id_test);
+ CPPUNIT_TEST (ce_string_parse_test);
+ CPPUNIT_TEST (escattr_test);
+ CPPUNIT_TEST (unescattr_test);
+ CPPUNIT_TEST (munge_error_message_test);
+ CPPUNIT_TEST (id2xml_test);
+ CPPUNIT_TEST (xml2id_test);
+
+ CPPUNIT_TEST (glob_test_1);
+ CPPUNIT_TEST (glob_test_2);
+ CPPUNIT_TEST (glob_test_3);
CPPUNIT_TEST_SUITE_END()
;
@@ -132,11 +135,11 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
string test_server_ce_spaces = "http://test.opendap.org/file.txt? u,v";
DBG(cerr << "Test Server CE Spaces: "
- << prune_spaces(test_server_ce_spaces) << endl);
+ << prune_spaces(test_server_ce_spaces) << endl);
CPPUNIT_ASSERT(prune_spaces(test_server_ce_spaces) == test_server_ce);
string hdf_two_var =
- "http://test.opendap.org/dap/data/hdf/S3096277.HDF.Z?Avg_Wind_Speed[0:5][0],RMS_Wind_Speed[0:5][0]";
+ "http://test.opendap.org/dap/data/hdf/S3096277.HDF.Z?Avg_Wind_Speed[0:5][0],RMS_Wind_Speed[0:5][0]";
CPPUNIT_ASSERT(prune_spaces(hdf_two_var) == hdf_two_var);
}
@@ -265,7 +268,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
DBG(cerr << "XXX" << unescattr("\\\"attr") << "XXX" << endl);
CPPUNIT_ASSERT(unescattr("\\\"attr") == "\"attr");
- char A_200_177[4] = { (char)128, 127, 'A', '\0' };
+ char A_200_177[4] = { (char) 128, 127, 'A', '\0' };
DBG(cerr << "XXX" << unescattr("\\200\\177A") << "XXX" << endl);
CPPUNIT_ASSERT(unescattr("\\200\\177A") == string(A_200_177));
@@ -307,7 +310,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
if (_putenv("TMPDIR=C:\\") == 0) {
DBG(cerr << "TMPDIR: " << getenv("TMPDIR") << endl);
CPPUNIT_ASSERT(strcmp(get_tempfile_template("DODSXXXXXX"),
- "C:\\DODSXXXXXX") == 0);
+ "C:\\DODSXXXXXX") == 0);
}
else
cerr << "Did not test setting TMPDIR; no test" << endl;
@@ -315,7 +318,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
if (setenv("TMPDIR", "/tmp", 1) == 0) {
DBG(cerr << "TMPDIR: " << getenv("TMPDIR") << endl);
CPPUNIT_ASSERT(strcmp(get_tempfile_template("DODSXXXXXX"),
- "/tmp/DODSXXXXXX") == 0);
+ "/tmp/DODSXXXXXX") == 0);
}
else
cerr << "Did not test setting TMPDIR; no test" << endl;
@@ -326,7 +329,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
tmplt.append("/"); tmplt.append("DODSXXXXXX");
putenv("TMPDIR=");
CPPUNIT_ASSERT(strcmp(get_tempfile_template("DODSXXXXXX"),
- tmplt.c_str()) == 0);
+ tmplt.c_str()) == 0);
#endif
}
#endif
@@ -365,14 +368,50 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(generalUtilTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (generalUtilTest);
-int main(int, char**)
+int main(int argc, char*argv[])
{
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: generalUtilTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = generalUtilTest::suite()->getTests();
+ unsigned int prefix_len = generalUtilTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- bool wasSuccessful = runner.run("", false);
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = generalUtilTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+
+ xmlMemoryDump();
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/marshT.cc b/unit-tests/marshT.cc
index fc54162..f689f9c 100644
--- a/unit-tests/marshT.cc
+++ b/unit-tests/marshT.cc
@@ -40,6 +40,7 @@ using std::cerr;
using std::cout;
using std::endl;
using std::ofstream;
+using namespace CppUnit;
int test_variable_sleep_interval = 0; // Used in Test* classes for testing timeouts.
@@ -55,354 +56,354 @@ static bool debug = false;
* when serializing datasets with large numbers of (large) variables.
* jhrg 8/4/15
*/
-class marshT: public CppUnit::TestFixture
-{
+class marshT: public CppUnit::TestFixture {
private:
- TestByte *b;
- TestInt16 *i16;
- TestInt32 *i32;
- TestUInt16 *ui16;
- TestUInt32 *ui32;
- TestFloat32 *f32;
- TestFloat64 *f64;
- TestStr *str;
- TestUrl *url;
- TestByte *ab;
+ TestByte *b;
+ TestInt16 *i16;
+ TestInt32 *i32;
+ TestUInt16 *ui16;
+ TestUInt32 *ui32;
+ TestFloat32 *f32;
+ TestFloat64 *f64;
+ TestStr *str;
+ TestUrl *url;
+ TestByte *ab;
- TestArray *arr;
+ TestArray *arr;
- TestStructure *s;
+ TestStructure *s;
- TestSequence *seq, *seq2;
+ TestSequence *seq, *seq2;
public:
- marshT() : b(0), i16(0), i32(0),
- ui16(0), ui32(0), f32(0), f64(0),
- str(0), url(0), ab(0), arr(0), s(0),
- seq(0), seq2(0)
- {
-
- }
-
- void setUp()
- {
- b = new TestByte("b");
- i16 = new TestInt16("i16");
- i32 = new TestInt32("i32");
- ui16 = new TestUInt16("ui16");
- ui32 = new TestUInt32("ui32");
- f32 = new TestFloat32("f32");
- f64 = new TestFloat64("f64");
- str = new TestStr("str");
- url = new TestUrl("url");
-
- ab = new TestByte("ab");
- arr = new TestArray("arr", ab);
- arr->append_dim(5, "dim1");
- arr->append_dim(3, "dim2");
-
- s = new TestStructure("s");
- s->add_var(i32);
- s->add_var(str);
- s->add_var(arr);
- s->set_send_p(true);
-
- seq = new TestSequence("seq");
- seq->add_var(f64);
- seq->add_var(arr);
-
- seq2 = new TestSequence("seq2");
- seq2->add_var(ui16);
- seq2->add_var(url);
- seq2->set_send_p(true);
-
- seq->add_var(seq2);
- seq->set_send_p(true);
- seq->set_leaf_sequence();
-
- // Need to call read so that the value() method calls in the ..read_test()
- // will work.
- b->read();
- i16->read();
- i32->read();
- ui16->read();
- ui32->read();
- f32->read();
- f64->read();
-
- str->read();
- url->read();
- arr->read();
- s->read();
- }
-
- void tearDown()
- {
- delete b; b = 0;
- delete i16; i16 = 0;
- delete i32; i32 = 0;
- delete ui16; ui16 = 0;
- delete ui32; ui32 = 0;
- delete f32; f32 = 0;
- delete f64; f64 = 0;
-
- delete str; str = 0;
- delete url; url = 0;
-
- delete ab; ab = 0;
- delete arr; arr = 0;
- delete s; s = 0;
- }
-
- void marshT_test_write(Marshaller &fm)
- {
- ConstraintEvaluator eval;
- TestTypeFactory ttf;
- DataDDS dds(&ttf, "dds");
-
- try
- {
- DBG(cerr << "serializing using XDRFileMarshaller" << endl);
-
- b->serialize(eval, dds, fm, false);
- i16->serialize(eval, dds, fm, false);
- i32->serialize(eval, dds, fm, false);
- ui16->serialize(eval, dds, fm, false);
- ui32->serialize(eval, dds, fm, false);
- f32->serialize(eval, dds, fm, false);
- f64->serialize(eval, dds, fm, false);
- str->serialize(eval, dds, fm, false);
- url->serialize(eval, dds, fm, false);
- s->serialize(eval, dds, fm, false);
- arr->serialize(eval, dds, fm, false);
- seq->serialize(eval, dds, fm, false);
-
- DBG(cerr << "done serializing using XDRFileMarshaller" << endl);
- }
- catch( Error &e )
- {
- string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL(err.c_str());
- }
- }
-
- // This test depends on the file written by the .._write_file() test,
- // so it must be run after that test.
- void marshT_test_read(UnMarshaller &um)
- {
- TestTypeFactory ttf;
- DataDDS dds(&ttf, "dds");
-
- // now read the values in and compare the with each other and the original values
- try
- {
- DBG(cerr << "deserializing XDRFileMarshaller built file" << endl);
-
- Byte fb("fb");
- fb.deserialize(um, &dds, false);
- CPPUNIT_ASSERT(fb.value() == b->value());
-
- Int16 fi16("i16");
- fi16.deserialize(um, &dds, false);
- DBG(cerr << "fi16.value(): " << fi16.value() << ", i16.value(): " << i16->value());
- CPPUNIT_ASSERT(fi16.value() == 32000);
-
- DBG(cerr << " file int32" << endl);
- Int32 fi32("i32");
- fi32.deserialize(um, &dds, false);
- DBG(cerr << "fi32.value(): " << fi32.value() << ", i32.value(): " << i32->value());
- CPPUNIT_ASSERT(fi32.value() == i32->value());
-
- UInt16 fui16("ui16");
- fui16.deserialize(um, &dds, false);
- DBG(cerr << "fui16.value(): " << fui16.value() << ", ui16.value(): " << ui16->value());
- CPPUNIT_ASSERT(fui16.value() == ui16->value());
-
- UInt32 fui32("ui32");
- fui32.deserialize(um, &dds, false);
- DBG(cerr << "fui32.value(): " << fui32.value() << ", ui32.value(): " << ui32->value());
- CPPUNIT_ASSERT(fui32.value() == ui32->value());
-
- Float32 ff32("f32");
- ff32.deserialize(um, &dds, false);
- DBG(cerr << "ff32.value(): " << ff32.value() << ", f32.value(): " << f32->value());
- CPPUNIT_ASSERT(ff32.value() == f32->value());
-
- Float64 ff64("f64");
- ff64.deserialize(um, &dds, false);
- DBG(cerr << "ff64.value(): " << ff64.value() << ", f64.value(): " << f64->value());
- CPPUNIT_ASSERT(ff64.value() == f64->value());
-
- Str fstr("str");
- fstr.deserialize(um, &dds, false);
- DBG(cerr << "fstr.value(): " << fstr.value() << ", str.value(): " << str->value());
- CPPUNIT_ASSERT(fstr.value() == str->value());
-
- Url furl("url");
- furl.deserialize(um, &dds, false);
- DBG(cerr << "furl.value(): " << furl.value() << ", url.value(): " << url->value());
- CPPUNIT_ASSERT(furl.value() == url->value());
-
- TestStructure fs("fs");
- TestInt32 fsi32("fsi32");
- fs.add_var(&fsi32);
- TestStr fsstr("fsstr");
- fs.add_var(&fsstr);
- TestByte fsab("fsab");
- TestArray fsarr("fsarr", &fsab);
- fsarr.append_dim(5, "dim1");
- fsarr.append_dim(3, "dim2");
- fs.add_var(&fsarr);
- fs.deserialize(um, &dds, false);
-
- Int32 *fsi32_p = dynamic_cast<Int32 *>(fs.var("fsi32"));
- CPPUNIT_ASSERT(fsi32_p);
- DBG(cerr << "fsi32.value(): " << fsi32_p->value() << ", i32.value(): " << i32->value());
- CPPUNIT_ASSERT(fsi32_p->value() == i32->value());
-
- Str *fsstr_p = dynamic_cast<Str *>(fs.var("fsstr"));
- CPPUNIT_ASSERT(fsstr_p);
- DBG(cerr << "fstr.value(): " << fsstr_p->value() << ", str.value(): " << dynamic_cast<Str *>(s->var("str"))->value());
- CPPUNIT_ASSERT(fsstr_p->value() == dynamic_cast<Str *>(s->var("str"))->value());
-
- BaseType *bt = fs.var("fsab");
- CPPUNIT_ASSERT(bt);
- Array *fsarr_p = dynamic_cast<Array *>(bt);
- CPPUNIT_ASSERT(fsarr_p);
- dods_byte fdb[fsarr_p->length() * sizeof(dods_byte)];
- dods_byte db[arr->length() * sizeof(dods_byte)];
- fsarr_p->value(fdb);
- arr->value(db);
- CPPUNIT_ASSERT(fsarr_p->length() == arr->length());
- CPPUNIT_ASSERT(
- !memcmp((void * )fdb, (void * )db,
- fsarr_p->length() * sizeof(dods_byte)));
-
- DBG(cerr << " file array" << endl);
- TestByte fab("ab");
- TestArray farr("arr", &fab);
- farr.append_dim(5, "dim1");
- farr.append_dim(3, "dim2");
- farr.deserialize(um, &dds, false);
- farr.value(fdb);
- CPPUNIT_ASSERT(farr.length() == arr->length());
- CPPUNIT_ASSERT(
- !memcmp((void * )fdb, (void * )db,
- farr.length() * sizeof(dods_byte)));
-
- TestSequence fseq("fseq");
- fseq.add_var(f64);
- fseq.add_var(arr);
- TestSequence fseq2("fseq2");
- fseq2.add_var(ui16);
- fseq2.add_var(url);
- fseq2.set_send_p(true);
- fseq.add_var(&fseq2);
- fseq.set_leaf_sequence();
-
- fseq.deserialize(um, &dds, false);
- unsigned int num_rows = fseq.number_of_rows();
- CPPUNIT_ASSERT(num_rows == 4);
- for (unsigned int i = 0; i < num_rows; i++)
- {
- BaseTypeRow *row = fseq.row_value(i);
- CPPUNIT_ASSERT(row);
- CPPUNIT_ASSERT(row->size() == 3);
- Float64 *f64_p = dynamic_cast<Float64 *>((*row)[0]);
- CPPUNIT_ASSERT(f64_p);
- CPPUNIT_ASSERT(f64_p->value() == f64->value());
- Array *arr_p = dynamic_cast<Array *>((*row)[1]);
- CPPUNIT_ASSERT(arr_p);
- arr_p->value(fdb);
- CPPUNIT_ASSERT(arr_p->length() == arr->length());
- CPPUNIT_ASSERT(
- !memcmp((void * )fdb, (void * )db,
- arr_p->length() * sizeof(dods_byte)));
- Sequence *seq_p = dynamic_cast<Sequence *>((*row)[2]);
- CPPUNIT_ASSERT(seq_p);
- unsigned int num_rows_sub = seq_p->number_of_rows();
- CPPUNIT_ASSERT(num_rows == 4);
- for (unsigned int j = 0; j < num_rows_sub; j++)
- {
- BaseTypeRow *row_sub = seq_p->row_value(j);
- CPPUNIT_ASSERT(row_sub);
- CPPUNIT_ASSERT(row_sub->size() == 2);
- UInt16 *ui16_p = dynamic_cast<UInt16 *>((*row_sub)[0]);
- CPPUNIT_ASSERT(ui16_p);
- CPPUNIT_ASSERT(ui16_p->value() == ui16->value());
- Url *url_p = dynamic_cast<Url *>((*row_sub)[1]);
- CPPUNIT_ASSERT(url_p);
- CPPUNIT_ASSERT(url_p->value() == url->value());
- }
- }
-
- DBG(cerr << "done deserializing XDRFileMarshaller built file" << endl);
- }
- catch( Error &e )
- {
- string err = "failed:" + e.get_error_message();
- CPPUNIT_FAIL(err.c_str());
- }
- }
-
- void marshT_test_write_file() {
- FILE *f = fopen("test.file", "w");
- XDRFileMarshaller fm(f);
-
- marshT_test_write(fm);
-
- fclose(f);
- }
-
- void marshT_test_read_file() {
- FILE *ff = fopen("test.file", "r");
- XDRFileUnMarshaller um(ff);
-
- marshT_test_read(um);
-
- fclose(ff);
- unlink("test.file");
- }
-
- void marshT_test_write_stream() {
- ofstream strm("test.strm", ios::out | ios::trunc);
- XDRStreamMarshaller sm(strm);
-
- marshT_test_write(sm);
-
- strm.close();
- }
-
- // Not that compelling a test really... (It is the same as .._read_file())
- void marshT_test_read_stream() {
- FILE *sf = fopen("test.strm", "r");
- XDRFileUnMarshaller um(sf);
-
- marshT_test_read(um);
-
- fclose(sf);
- unlink("test.strm");
- }
-
- CPPUNIT_TEST_SUITE( marshT );
-
- CPPUNIT_TEST(marshT_test_write_file);
- CPPUNIT_TEST(marshT_test_read_file);
- CPPUNIT_TEST(marshT_test_write_stream);
- CPPUNIT_TEST(marshT_test_read_stream);
-
- CPPUNIT_TEST_SUITE_END( );
+ marshT() :
+ b(0), i16(0), i32(0), ui16(0), ui32(0), f32(0), f64(0), str(0), url(0), ab(0), arr(0), s(0), seq(0), seq2(0)
+ {
+
+ }
+
+ void setUp()
+ {
+ b = new TestByte("b");
+ i16 = new TestInt16("i16");
+ i32 = new TestInt32("i32");
+ ui16 = new TestUInt16("ui16");
+ ui32 = new TestUInt32("ui32");
+ f32 = new TestFloat32("f32");
+ f64 = new TestFloat64("f64");
+ str = new TestStr("str");
+ url = new TestUrl("url");
+
+ ab = new TestByte("ab");
+ arr = new TestArray("arr", ab);
+ arr->append_dim(5, "dim1");
+ arr->append_dim(3, "dim2");
+
+ s = new TestStructure("s");
+ s->add_var(i32);
+ s->add_var(str);
+ s->add_var(arr);
+ s->set_send_p(true);
+
+ seq = new TestSequence("seq");
+ seq->add_var(f64);
+ seq->add_var(arr);
+
+ seq2 = new TestSequence("seq2");
+ seq2->add_var(ui16);
+ seq2->add_var(url);
+ seq2->set_send_p(true);
+
+ seq->add_var(seq2);
+ seq->set_send_p(true);
+ seq->set_leaf_sequence();
+
+ // Need to call read so that the value() method calls in the ..read_test()
+ // will work.
+ b->read();
+ i16->read();
+ i32->read();
+ ui16->read();
+ ui32->read();
+ f32->read();
+ f64->read();
+
+ str->read();
+ url->read();
+ arr->read();
+ s->read();
+ }
+
+ void tearDown()
+ {
+ delete b;
+ b = 0;
+ delete i16;
+ i16 = 0;
+ delete i32;
+ i32 = 0;
+ delete ui16;
+ ui16 = 0;
+ delete ui32;
+ ui32 = 0;
+ delete f32;
+ f32 = 0;
+ delete f64;
+ f64 = 0;
+
+ delete str;
+ str = 0;
+ delete url;
+ url = 0;
+
+ delete ab;
+ ab = 0;
+ delete arr;
+ arr = 0;
+ delete s;
+ s = 0;
+ }
+
+ void marshT_test_write(Marshaller &fm)
+ {
+ ConstraintEvaluator eval;
+ TestTypeFactory ttf;
+ DataDDS dds(&ttf, "dds");
+
+ try {
+ DBG(cerr << "serializing using XDRFileMarshaller" << endl);
+
+ b->serialize(eval, dds, fm, false);
+ i16->serialize(eval, dds, fm, false);
+ i32->serialize(eval, dds, fm, false);
+ ui16->serialize(eval, dds, fm, false);
+ ui32->serialize(eval, dds, fm, false);
+ f32->serialize(eval, dds, fm, false);
+ f64->serialize(eval, dds, fm, false);
+ str->serialize(eval, dds, fm, false);
+ url->serialize(eval, dds, fm, false);
+ s->serialize(eval, dds, fm, false);
+ arr->serialize(eval, dds, fm, false);
+ seq->serialize(eval, dds, fm, false);
+
+ DBG(cerr << "done serializing using XDRFileMarshaller" << endl);
+ }
+ catch (Error &e) {
+ string err = "failed:" + e.get_error_message();
+ CPPUNIT_FAIL(err.c_str());
+ }
+ }
+
+ // This test depends on the file written by the .._write_file() test,
+ // so it must be run after that test.
+ void marshT_test_read(UnMarshaller &um)
+ {
+ TestTypeFactory ttf;
+ DataDDS dds(&ttf, "dds");
+
+ // now read the values in and compare the with each other and the original values
+ try {
+ DBG(cerr << "deserializing XDRFileMarshaller built file" << endl);
+
+ Byte fb("fb");
+ fb.deserialize(um, &dds, false);
+ CPPUNIT_ASSERT(fb.value() == b->value());
+
+ Int16 fi16("i16");
+ fi16.deserialize(um, &dds, false);
+ DBG(cerr << "fi16.value(): " << fi16.value() << ", i16.value(): " << i16->value());
+ CPPUNIT_ASSERT(fi16.value() == 32000);
+
+ DBG(cerr << " file int32" << endl);
+ Int32 fi32("i32");
+ fi32.deserialize(um, &dds, false);
+ DBG(cerr << "fi32.value(): " << fi32.value() << ", i32.value(): " << i32->value());
+ CPPUNIT_ASSERT(fi32.value() == i32->value());
+
+ UInt16 fui16("ui16");
+ fui16.deserialize(um, &dds, false);
+ DBG(cerr << "fui16.value(): " << fui16.value() << ", ui16.value(): " << ui16->value());
+ CPPUNIT_ASSERT(fui16.value() == ui16->value());
+
+ UInt32 fui32("ui32");
+ fui32.deserialize(um, &dds, false);
+ DBG(cerr << "fui32.value(): " << fui32.value() << ", ui32.value(): " << ui32->value());
+ CPPUNIT_ASSERT(fui32.value() == ui32->value());
+
+ Float32 ff32("f32");
+ ff32.deserialize(um, &dds, false);
+ DBG(cerr << "ff32.value(): " << ff32.value() << ", f32.value(): " << f32->value());
+ CPPUNIT_ASSERT(ff32.value() == f32->value());
+
+ Float64 ff64("f64");
+ ff64.deserialize(um, &dds, false);
+ DBG(cerr << "ff64.value(): " << ff64.value() << ", f64.value(): " << f64->value());
+ CPPUNIT_ASSERT(ff64.value() == f64->value());
+
+ Str fstr("str");
+ fstr.deserialize(um, &dds, false);
+ DBG(cerr << "fstr.value(): " << fstr.value() << ", str.value(): " << str->value());
+ CPPUNIT_ASSERT(fstr.value() == str->value());
+
+ Url furl("url");
+ furl.deserialize(um, &dds, false);
+ DBG(cerr << "furl.value(): " << furl.value() << ", url.value(): " << url->value());
+ CPPUNIT_ASSERT(furl.value() == url->value());
+
+ TestStructure fs("fs");
+ TestInt32 fsi32("fsi32");
+ fs.add_var(&fsi32);
+ TestStr fsstr("fsstr");
+ fs.add_var(&fsstr);
+ TestByte fsab("fsab");
+ TestArray fsarr("fsarr", &fsab);
+ fsarr.append_dim(5, "dim1");
+ fsarr.append_dim(3, "dim2");
+ fs.add_var(&fsarr);
+ fs.deserialize(um, &dds, false);
+
+ Int32 *fsi32_p = dynamic_cast<Int32 *>(fs.var("fsi32"));
+ CPPUNIT_ASSERT(fsi32_p);
+ DBG(cerr << "fsi32.value(): " << fsi32_p->value() << ", i32.value(): " << i32->value());
+ CPPUNIT_ASSERT(fsi32_p->value() == i32->value());
+
+ Str *fsstr_p = dynamic_cast<Str *>(fs.var("fsstr"));
+ CPPUNIT_ASSERT(fsstr_p);
+ DBG(
+ cerr << "fstr.value(): " << fsstr_p->value() << ", str.value(): "
+ << dynamic_cast<Str *>(s->var("str"))->value());
+ CPPUNIT_ASSERT(fsstr_p->value() == dynamic_cast<Str *>(s->var("str"))->value());
+
+ BaseType *bt = fs.var("fsab");
+ CPPUNIT_ASSERT(bt);
+ Array *fsarr_p = dynamic_cast<Array *>(bt);
+ CPPUNIT_ASSERT(fsarr_p);
+ dods_byte fdb[fsarr_p->length() * sizeof(dods_byte)];
+ dods_byte db[arr->length() * sizeof(dods_byte)];
+ fsarr_p->value(fdb);
+ arr->value(db);
+ CPPUNIT_ASSERT(fsarr_p->length() == arr->length());
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) db, fsarr_p->length() * sizeof(dods_byte)));
+
+ DBG(cerr << " file array" << endl);
+ TestByte fab("ab");
+ TestArray farr("arr", &fab);
+ farr.append_dim(5, "dim1");
+ farr.append_dim(3, "dim2");
+ farr.deserialize(um, &dds, false);
+ farr.value(fdb);
+ CPPUNIT_ASSERT(farr.length() == arr->length());
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) db, farr.length() * sizeof(dods_byte)));
+
+ TestSequence fseq("fseq");
+ fseq.add_var(f64);
+ fseq.add_var(arr);
+ TestSequence fseq2("fseq2");
+ fseq2.add_var(ui16);
+ fseq2.add_var(url);
+ fseq2.set_send_p(true);
+ fseq.add_var(&fseq2);
+ fseq.set_leaf_sequence();
+
+ fseq.deserialize(um, &dds, false);
+ unsigned int num_rows = fseq.number_of_rows();
+ CPPUNIT_ASSERT(num_rows == 4);
+ for (unsigned int i = 0; i < num_rows; i++) {
+ BaseTypeRow *row = fseq.row_value(i);
+ CPPUNIT_ASSERT(row);
+ CPPUNIT_ASSERT(row->size() == 3);
+ Float64 *f64_p = dynamic_cast<Float64 *>((*row)[0]);
+ CPPUNIT_ASSERT(f64_p);
+ CPPUNIT_ASSERT(f64_p->value() == f64->value());
+ Array *arr_p = dynamic_cast<Array *>((*row)[1]);
+ CPPUNIT_ASSERT(arr_p);
+ arr_p->value(fdb);
+ CPPUNIT_ASSERT(arr_p->length() == arr->length());
+ CPPUNIT_ASSERT(!memcmp((void *) fdb, (void *) db, arr_p->length() * sizeof(dods_byte)));
+ Sequence *seq_p = dynamic_cast<Sequence *>((*row)[2]);
+ CPPUNIT_ASSERT(seq_p);
+ unsigned int num_rows_sub = seq_p->number_of_rows();
+ CPPUNIT_ASSERT(num_rows == 4);
+ for (unsigned int j = 0; j < num_rows_sub; j++) {
+ BaseTypeRow *row_sub = seq_p->row_value(j);
+ CPPUNIT_ASSERT(row_sub);
+ CPPUNIT_ASSERT(row_sub->size() == 2);
+ UInt16 *ui16_p = dynamic_cast<UInt16 *>((*row_sub)[0]);
+ CPPUNIT_ASSERT(ui16_p);
+ CPPUNIT_ASSERT(ui16_p->value() == ui16->value());
+ Url *url_p = dynamic_cast<Url *>((*row_sub)[1]);
+ CPPUNIT_ASSERT(url_p);
+ CPPUNIT_ASSERT(url_p->value() == url->value());
+ }
+ }
+
+ DBG(cerr << "done deserializing XDRFileMarshaller built file" << endl);
+ }
+ catch (Error &e) {
+ string err = "failed:" + e.get_error_message();
+ CPPUNIT_FAIL(err.c_str());
+ }
+ }
+
+ void marshT_test_write_file()
+ {
+ FILE *f = fopen("test.file", "w");
+ XDRFileMarshaller fm(f);
+
+ marshT_test_write(fm);
+
+ fclose(f);
+ }
+
+ void marshT_test_read_file()
+ {
+ FILE *ff = fopen("test.file", "r");
+ XDRFileUnMarshaller um(ff);
+
+ marshT_test_read(um);
+
+ fclose(ff);
+ unlink("test.file");
+ }
+
+ void marshT_test_write_stream()
+ {
+ ofstream strm("test.strm", ios::out | ios::trunc);
+ XDRStreamMarshaller sm(strm);
+
+ marshT_test_write(sm);
+
+ strm.close();
+ }
+
+ // Not that compelling a test really... (It is the same as .._read_file())
+ void marshT_test_read_stream()
+ {
+ FILE *sf = fopen("test.strm", "r");
+ XDRFileUnMarshaller um(sf);
+
+ marshT_test_read(um);
+
+ fclose(sf);
+ unlink("test.strm");
+ }
+
+ CPPUNIT_TEST_SUITE (marshT);
+
+ CPPUNIT_TEST (marshT_test_write_file);
+ CPPUNIT_TEST (marshT_test_read_file);
+ CPPUNIT_TEST (marshT_test_write_stream);
+ CPPUNIT_TEST (marshT_test_read_stream);
+
+ CPPUNIT_TEST_SUITE_END( );
};
-CPPUNIT_TEST_SUITE_REGISTRATION(marshT);
+CPPUNIT_TEST_SUITE_REGISTRATION (marshT);
int main(int argc, char *argv[])
{
- CppUnit::TextTestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
-
- GetOpt getopt(argc, argv, "d");
+ GetOpt getopt(argc, argv, "dh");
int option_char;
while ((option_char = getopt()) != -1)
@@ -410,10 +411,22 @@ int main(int argc, char *argv[])
case 'd':
debug = 1; // debug is a static global
break;
+ case 'h': { // help - show test names
+ cerr << "Usage: marshT has the following tests:" << endl;
+ const std::vector<Test*> &tests = marshT::suite()->getTests();
+ unsigned int prefix_len = marshT::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
default:
break;
}
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
bool wasSuccessful = true;
string test = "";
int i = getopt.optind;
@@ -422,9 +435,9 @@ int main(int argc, char *argv[])
wasSuccessful = runner.run("");
}
else {
- while (i < argc) {
- test = string("libdap::marshT::") + argv[i++];
- DBG(cerr << "test: " << test << endl);
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = marshT::suite()->getName().append("::").append(argv[i]);
wasSuccessful = wasSuccessful && runner.run(test);
}
}
diff --git a/unit-tests/parserUtilTest.cc b/unit-tests/parserUtilTest.cc
index f79a11a..8831160 100644
--- a/unit-tests/parserUtilTest.cc
+++ b/unit-tests/parserUtilTest.cc
@@ -1,4 +1,3 @@
-
// -*- mode: c++; c-basic-offset:4 -*-
// This file is part of libdap, A C++ implementation of the OPeNDAP Data
@@ -22,124 +21,170 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
// You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
-
+
#include <cppunit/TextTestRunner.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/extensions/HelperMacros.h>
#include "parser.h"
+#include "GetOpt.h"
+
using namespace CppUnit;
using namespace libdap;
+using namespace std;
-class parserUtilTest : public TestFixture {
+static bool debug = false;
+
+class parserUtilTest: public TestFixture {
private:
-public:
- parserUtilTest() {}
- ~parserUtilTest() {}
+public:
+ parserUtilTest()
+ {
+ }
+ ~parserUtilTest()
+ {
+ }
- void setUp() {
+ void setUp()
+ {
}
- void tearDown() {
+ void tearDown()
+ {
}
- CPPUNIT_TEST_SUITE(parserUtilTest);
+ CPPUNIT_TEST_SUITE (parserUtilTest);
- CPPUNIT_TEST(check_byte_test);
- CPPUNIT_TEST(check_float32_test);
- CPPUNIT_TEST(check_float64_test);
+ CPPUNIT_TEST (check_byte_test);
+ CPPUNIT_TEST (check_float32_test);
+ CPPUNIT_TEST (check_float64_test);
CPPUNIT_TEST_SUITE_END();
// Tests for methods
- void check_byte_test() {
- CPPUNIT_ASSERT(check_byte("255"));
- CPPUNIT_ASSERT(!check_byte("256"));
- CPPUNIT_ASSERT(check_byte("0"));
- CPPUNIT_ASSERT(check_byte("-127"));
- CPPUNIT_ASSERT(check_byte("-128"));
- CPPUNIT_ASSERT(!check_byte("-129"));
- CPPUNIT_ASSERT(!check_byte("-32767"));
- CPPUNIT_ASSERT(!check_byte("32767"));
+ void check_byte_test()
+ {
+ CPPUNIT_ASSERT(check_byte("255"));
+ CPPUNIT_ASSERT(!check_byte("256"));
+ CPPUNIT_ASSERT(check_byte("0"));
+ CPPUNIT_ASSERT(check_byte("-127"));
+ CPPUNIT_ASSERT(check_byte("-128"));
+ CPPUNIT_ASSERT(!check_byte("-129"));
+ CPPUNIT_ASSERT(!check_byte("-32767"));
+ CPPUNIT_ASSERT(!check_byte("32767"));
}
- void check_float32_test() {
- CPPUNIT_ASSERT(check_float32("1.0"));
- CPPUNIT_ASSERT(check_float32("0.0"));
- CPPUNIT_ASSERT(check_float32("-0.0"));
- CPPUNIT_ASSERT(check_float32("+0.0"));
- CPPUNIT_ASSERT(check_float32(".0"));
-
- CPPUNIT_ASSERT(!check_float64("3.0.0"));
- CPPUNIT_ASSERT(!check_float64("3..0"));
-
- CPPUNIT_ASSERT(check_float32("3.402823466E+38"));
- CPPUNIT_ASSERT(check_float32("-3.402823466E+38"));
- CPPUNIT_ASSERT(check_float32("1.175494351E-38"));
- CPPUNIT_ASSERT(check_float32("-1.175494351E-38"));
-
- CPPUNIT_ASSERT(check_float32("NaN"));
- CPPUNIT_ASSERT(check_float32("nan"));
- CPPUNIT_ASSERT(check_float32("Nan"));
-
- CPPUNIT_ASSERT(!check_float32("3.502823466E+38"));
- CPPUNIT_ASSERT(!check_float32("-3.502823466E+38"));
- CPPUNIT_ASSERT(!check_float32("1.0E-38"));
- CPPUNIT_ASSERT(!check_float32("-1.0E-38"));
-
- CPPUNIT_ASSERT(!check_float32("1.7976931348623157E+308"));
- CPPUNIT_ASSERT(!check_float32("-1.7976931348623157E+308"));
- CPPUNIT_ASSERT(!check_float32("2.2250738585072014E-308"));
- CPPUNIT_ASSERT(!check_float32("-2.2250738585072014E-308"));
+ void check_float32_test()
+ {
+ CPPUNIT_ASSERT(check_float32("1.0"));
+ CPPUNIT_ASSERT(check_float32("0.0"));
+ CPPUNIT_ASSERT(check_float32("-0.0"));
+ CPPUNIT_ASSERT(check_float32("+0.0"));
+ CPPUNIT_ASSERT(check_float32(".0"));
+
+ CPPUNIT_ASSERT(!check_float64("3.0.0"));
+ CPPUNIT_ASSERT(!check_float64("3..0"));
+
+ CPPUNIT_ASSERT(check_float32("3.402823466E+38"));
+ CPPUNIT_ASSERT(check_float32("-3.402823466E+38"));
+ CPPUNIT_ASSERT(check_float32("1.175494351E-38"));
+ CPPUNIT_ASSERT(check_float32("-1.175494351E-38"));
+
+ CPPUNIT_ASSERT(check_float32("NaN"));
+ CPPUNIT_ASSERT(check_float32("nan"));
+ CPPUNIT_ASSERT(check_float32("Nan"));
+
+ CPPUNIT_ASSERT(!check_float32("3.502823466E+38"));
+ CPPUNIT_ASSERT(!check_float32("-3.502823466E+38"));
+ CPPUNIT_ASSERT(!check_float32("1.0E-38"));
+ CPPUNIT_ASSERT(!check_float32("-1.0E-38"));
+
+ CPPUNIT_ASSERT(!check_float32("1.7976931348623157E+308"));
+ CPPUNIT_ASSERT(!check_float32("-1.7976931348623157E+308"));
+ CPPUNIT_ASSERT(!check_float32("2.2250738585072014E-308"));
+ CPPUNIT_ASSERT(!check_float32("-2.2250738585072014E-308"));
}
-
- void check_float64_test() {
- CPPUNIT_ASSERT(check_float64("1.0"));
- CPPUNIT_ASSERT(check_float64("0.0"));
- CPPUNIT_ASSERT(check_float64("-0.0"));
- CPPUNIT_ASSERT(check_float64("+0.0"));
- CPPUNIT_ASSERT(check_float64(".0"));
-
- CPPUNIT_ASSERT(!check_float64("3.0.0"));
- CPPUNIT_ASSERT(!check_float64("3..0"));
-
- CPPUNIT_ASSERT(check_float64("3.402823466E+38"));
- CPPUNIT_ASSERT(check_float64("-3.402823466E+38"));
- CPPUNIT_ASSERT(check_float64("1.175494351E-38"));
- CPPUNIT_ASSERT(check_float64("-1.175494351E-38"));
-
- CPPUNIT_ASSERT(check_float64("1.7976931348623157E+308"));
- CPPUNIT_ASSERT(check_float64("-1.7976931348623157E+308"));
- CPPUNIT_ASSERT(check_float64("2.2250738585072014E-308"));
- CPPUNIT_ASSERT(check_float64("-2.2250738585072014E-308"));
-
- CPPUNIT_ASSERT(check_float64("NaN"));
- CPPUNIT_ASSERT(check_float64("nan"));
- CPPUNIT_ASSERT(check_float64("Nan"));
-
- CPPUNIT_ASSERT(!check_float64("255E400"));
- CPPUNIT_ASSERT(!check_float64("255E-400"));
-
- CPPUNIT_ASSERT(!check_float64("1.8E+308"));
- CPPUNIT_ASSERT(!check_float64("-1.8E+308"));
- CPPUNIT_ASSERT(!check_float64("2.0E-308"));
- CPPUNIT_ASSERT(!check_float64("-2.0E-308"));
+
+ void check_float64_test()
+ {
+ CPPUNIT_ASSERT(check_float64("1.0"));
+ CPPUNIT_ASSERT(check_float64("0.0"));
+ CPPUNIT_ASSERT(check_float64("-0.0"));
+ CPPUNIT_ASSERT(check_float64("+0.0"));
+ CPPUNIT_ASSERT(check_float64(".0"));
+
+ CPPUNIT_ASSERT(!check_float64("3.0.0"));
+ CPPUNIT_ASSERT(!check_float64("3..0"));
+
+ CPPUNIT_ASSERT(check_float64("3.402823466E+38"));
+ CPPUNIT_ASSERT(check_float64("-3.402823466E+38"));
+ CPPUNIT_ASSERT(check_float64("1.175494351E-38"));
+ CPPUNIT_ASSERT(check_float64("-1.175494351E-38"));
+
+ CPPUNIT_ASSERT(check_float64("1.7976931348623157E+308"));
+ CPPUNIT_ASSERT(check_float64("-1.7976931348623157E+308"));
+ CPPUNIT_ASSERT(check_float64("2.2250738585072014E-308"));
+ CPPUNIT_ASSERT(check_float64("-2.2250738585072014E-308"));
+
+ CPPUNIT_ASSERT(check_float64("NaN"));
+ CPPUNIT_ASSERT(check_float64("nan"));
+ CPPUNIT_ASSERT(check_float64("Nan"));
+
+ CPPUNIT_ASSERT(!check_float64("255E400"));
+ CPPUNIT_ASSERT(!check_float64("255E-400"));
+
+ CPPUNIT_ASSERT(!check_float64("1.8E+308"));
+ CPPUNIT_ASSERT(!check_float64("-1.8E+308"));
+ CPPUNIT_ASSERT(!check_float64("2.0E-308"));
+ CPPUNIT_ASSERT(!check_float64("-2.0E-308"));
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(parserUtilTest);
+CPPUNIT_TEST_SUITE_REGISTRATION (parserUtilTest);
-int
-main( int, char** )
+int main(int argc, char*argv[])
{
- CppUnit::TextTestRunner runner;
- runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: parserUtilTest has the following tests:" << endl;
+ const std::vector<Test*> &tests = parserUtilTest::suite()->getTests();
+ unsigned int prefix_len = parserUtilTest::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
- bool wasSuccessful = runner.run( "", false ) ;
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << std::endl;
+ test = parserUtilTest::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
-
diff --git a/unit-tests/sequenceT.cc b/unit-tests/sequenceT.cc
index f0fe747..2e6804d 100644
--- a/unit-tests/sequenceT.cc
+++ b/unit-tests/sequenceT.cc
@@ -1,4 +1,3 @@
-
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -12,132 +11,165 @@
#include "TestStr.h"
#include "TestTypeFactory.h"
#include "util.h"
-//#include "Pix.h"
+#include "GetOpt.h"
-using std::cerr ;
-using std::endl ;
+using std::cerr;
+using std::endl;
-using namespace libdap ;
+using namespace libdap;
+using namespace CppUnit;
int test_variable_sleep_interval = 0; // Used in Test* classes for testing
- // timeouts.
-class sequenceT : public CppUnit::TestFixture {
+// timeouts.
+
+static bool debug = false;
+
+class sequenceT: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE( sequenceT ) ;
-CPPUNIT_TEST( sequenceT_test ) ;
-CPPUNIT_TEST_SUITE_END( ) ;
+ CPPUNIT_TEST_SUITE (sequenceT);
+ CPPUNIT_TEST (sequenceT_test);CPPUNIT_TEST_SUITE_END( );
private:
/* TEST PRIVATE DATA */
TestTypeFactory *factory;
-
+
public:
void setUp()
{
factory = new TestTypeFactory;
}
- void tearDown()
+ void tearDown()
{
- delete factory; factory = 0;
+ delete factory;
+ factory = 0;
}
void sequenceT_test()
{
- TestSequence s( "Supporters" ) ;
-
- BaseType *nm = factory->NewStr( "Name" ) ;
- s.add_var( nm ) ;
-
- BaseType *age = factory->NewInt16( "Age" ) ;
- s.add_var( age ) ;
-
- TestSequence *friends = (TestSequence *)factory->NewSequence( "Friends" ) ;
- friends->add_var( nm ) ;
- delete nm ; nm = 0 ;
- friends->add_var( age ) ;
- delete age ; age = 0 ;
- s.add_var( friends ) ;
- delete friends ; friends = 0 ;
-
- BaseType *bt = s.var( "Age" ) ;
- CPPUNIT_ASSERT( bt->name( ) == "Age" ) ;
-
- bt = s.var( "Age", false ) ;
- CPPUNIT_ASSERT( bt->name( ) == "Age" ) ;
-
- BaseType::btp_stack btps ;
- bt = s.var( "Friends.Age", btps ) ;
- CPPUNIT_ASSERT( bt->name( ) == "Age" ) ;
- CPPUNIT_ASSERT( btps.size( ) == 2 ) ;
-
- vector<string> names ;
- names.push_back( "Friends" ) ;
- names.push_back( "Supporters" ) ;
- typedef vector<string>::const_iterator names_iter ;
- names_iter n = names.begin( ) ;
- while( !btps.empty( ) && n != names.end( ) )
- {
- BaseType *curr = btps.top( ) ;
- CPPUNIT_ASSERT( curr->name( ) == (*n) ) ;
- btps.pop( ) ;
- n++ ;
- }
-
- int num_elems = s.element_count( false ) ;
- CPPUNIT_ASSERT( num_elems == 3 ) ;
-
- num_elems = s.element_count( true ) ;
- CPPUNIT_ASSERT( num_elems == 4 ) ;
+ TestSequence s("Supporters");
+
+ BaseType *nm = factory->NewStr("Name");
+ s.add_var(nm);
+
+ BaseType *age = factory->NewInt16("Age");
+ s.add_var(age);
+
+ TestSequence *friends = (TestSequence *) factory->NewSequence("Friends");
+ friends->add_var(nm);
+ delete nm;
+ nm = 0;
+ friends->add_var(age);
+ delete age;
+ age = 0;
+ s.add_var(friends);
+ delete friends;
+ friends = 0;
+
+ BaseType *bt = s.var("Age");
+ CPPUNIT_ASSERT(bt->name() == "Age");
+
+ bt = s.var("Age", false);
+ CPPUNIT_ASSERT(bt->name() == "Age");
+
+ BaseType::btp_stack btps;
+ bt = s.var("Friends.Age", btps);
+ CPPUNIT_ASSERT(bt->name() == "Age");
+ CPPUNIT_ASSERT(btps.size() == 2);
+
+ vector<string> names;
+ names.push_back("Friends");
+ names.push_back("Supporters");
+ typedef vector<string>::const_iterator names_iter;
+ names_iter n = names.begin();
+ while (!btps.empty() && n != names.end()) {
+ BaseType *curr = btps.top();
+ CPPUNIT_ASSERT(curr->name() == (*n));
+ btps.pop();
+ n++;
+ }
+
+ int num_elems = s.element_count(false);
+ CPPUNIT_ASSERT(num_elems == 3);
+
+ num_elems = s.element_count(true);
+ CPPUNIT_ASSERT(num_elems == 4);
#if 0
- // This is only true on 32 bit machines, on a 64bit machine is will
- // probably be 24.
- unsigned int w = s.width( ) ;
- CPPUNIT_ASSERT( w == 12 ) ;
+ // This is only true on 32 bit machines, on a 64bit machine is will
+ // probably be 24.
+ unsigned int w = s.width( );
+ CPPUNIT_ASSERT( w == 12 );
#endif
- vector<string> elems ;
- elems.push_back( "Name" ) ;
- elems.push_back( "Age" ) ;
- elems.push_back( "Friends" ) ;
- typedef vector<string>::const_iterator elems_iter ;
-
- Sequence::Vars_iter v = s.var_begin() ;
- elems_iter e = elems.begin() ;
- for( ; v != s.var_end() && e != elems.end(); v++, e++ )
- {
- CPPUNIT_ASSERT( (*v)->name() == (*e) ) ;
- }
- CPPUNIT_ASSERT( v == s.var_end() && e == elems.end() ) ;
- if( v != s.var_end() && e == elems.end() )
- {
- CPPUNIT_FAIL( "Too many elements" ) ;
- }
- else if( v == s.var_end() && e != elems.end() )
- {
- CPPUNIT_FAIL( "Too few elements" ) ;
- }
-
- int num_rows = s.number_of_rows( ) ;
- CPPUNIT_ASSERT( num_rows == 0 ) ;
+ vector<string> elems;
+ elems.push_back("Name");
+ elems.push_back("Age");
+ elems.push_back("Friends");
+ typedef vector<string>::const_iterator elems_iter;
+
+ Sequence::Vars_iter v = s.var_begin();
+ elems_iter e = elems.begin();
+ for (; v != s.var_end() && e != elems.end(); v++, e++) {
+ CPPUNIT_ASSERT((*v)->name() == (*e));
+ }
+ CPPUNIT_ASSERT(v == s.var_end() && e == elems.end());
+ if (v != s.var_end() && e == elems.end()) {
+ CPPUNIT_FAIL("Too many elements");
+ }
+ else if (v == s.var_end() && e != elems.end()) {
+ CPPUNIT_FAIL("Too few elements");
+ }
+
+ int num_rows = s.number_of_rows();
+ CPPUNIT_ASSERT(num_rows == 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( sequenceT ) ;
+CPPUNIT_TEST_SUITE_REGISTRATION (sequenceT);
/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
-int main( int, char ** )
+int main(int argc, char*argv[])
{
- CppUnit::TextUi::TestRunner runner ;
- CppUnit::TestFactoryRegistry ®istry =
- CppUnit::TestFactoryRegistry::getRegistry() ;
- runner.addTest( registry.makeTest() ) ;
- runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(
- &runner.result(),
- std::cerr ) );
- bool wasSuccessful = runner.run( "", false ) ;
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+ case 'h': { // help - show test names
+ cerr << "Usage: sequenceT has the following tests:" << endl;
+ const std::vector<Test*> &tests = sequenceT::suite()->getTests();
+ unsigned int prefix_len = sequenceT::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for (; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = sequenceT::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/structT.cc b/unit-tests/structT.cc
index e742919..02046d4 100644
--- a/unit-tests/structT.cc
+++ b/unit-tests/structT.cc
@@ -13,143 +13,182 @@
#include "TestStr.h"
#include "TestTypeFactory.h"
#include "util.h"
-//#include "Pix.h"
+#include "GetOpt.h"
using std::cerr;
using std::endl;
using std::ostringstream;
+using namespace CppUnit;
+
int test_variable_sleep_interval = 0; // Used in Test* classes for testing
// timeouts.
+
+static bool debug = false;
+
string ExpectedPrint1(
- "Structure {\n\
+ "Structure {\n\
Int16 name_int16;\n\
String name_str;\n\
Int16 array_int[dim1 = 4][dim2 = 3][dim3 = 2];\n\
} my_structure = { 32000, \"Silly test string: 1\", {{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}}} };\n");
string ExpectedPrint2(
- "Structure {\n\
+ "Structure {\n\
Int16 name_int16;\n\
Int16 array_int[dim1 = 4][dim2 = 3][dim3 = 2];\n\
} my_structure = { 32000, {{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}},{{32000, 32000},{32000, 32000},{32000, 32000}}} };\n");
class structT: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE( structT );
- CPPUNIT_TEST( structT_test );
- CPPUNIT_TEST_SUITE_END( )
- ;
+ CPPUNIT_TEST_SUITE (structT);
+ CPPUNIT_TEST (structT_test);CPPUNIT_TEST_SUITE_END( )
+ ;
private:
- /* TEST PRIVATE DATA */
- TestTypeFactory *factory;
+ /* TEST PRIVATE DATA */
+ TestTypeFactory *factory;
public:
- void setUp()
- {
- factory = new TestTypeFactory;
- }
-
- void tearDown()
- {
- delete factory;
- factory = 0;
- }
-
- void structT_test()
- {
- TestStructure s("my_structure");
-
- BaseType *bt = factory->NewInt16("name_int16");
- s.add_var(bt);
- delete bt;
- bt = 0;
-
- bt = factory->NewStr("name_str");
- s.add_var(bt);
- delete bt;
- bt = 0;
-
- // TODO Check Does this leak the Int16
- Array *abt = factory->NewArray("name_array", factory->NewInt16("array_int"));
- abt->append_dim(4, "dim1");
- abt->append_dim(3, "dim2");
- abt->append_dim(2, "dim3");
- s.add_var(abt);
- delete abt;
- abt = 0;
-
- bt = 0;
- bt = s.var("name_str", true);
- CPPUNIT_ASSERT( bt && bt->name() == "name_str" );
-
- bt = 0;
- bt = s.var("name_str", false);
- CPPUNIT_ASSERT( bt && bt->name() == "name_str" );
-
- vector<string> varnames;
- varnames.push_back("name_int16");
- varnames.push_back("name_str");
- varnames.push_back("array_int");
- typedef vector<string>::const_iterator niter;
-
- Structure::Vars_iter viter = s.var_begin();
- niter n = varnames.begin();
- for (; viter != s.var_end() && n != varnames.end(); viter++, n++) {
- CPPUNIT_ASSERT( (*viter)->name() == *n );
- }
- CPPUNIT_ASSERT( viter == s.var_end() && n == varnames.end() );
- if (viter != s.var_end() && n == varnames.end()) {
- CPPUNIT_FAIL( "Too many variables" );
- }
- else if( viter == s.var_end() && n != varnames.end() )
- {
- CPPUNIT_FAIL( "Too few varialbes" );
- }
-
- int num_elems = s.element_count();
- CPPUNIT_ASSERT( num_elems == 3 );
-
- unsigned int w = s.width();
- unsigned int wsb = sizeof(string) + sizeof(dods_int16) + 24 * sizeof(dods_int16);
- cerr << "s.width(): " << s.width() << endl;
- CPPUNIT_ASSERT( w == wsb );
-
- bool is_read = s.read();
- CPPUNIT_ASSERT( is_read == true );
-
- ostringstream sstrm1;
- s.print_val(sstrm1);
- CPPUNIT_ASSERT( sstrm1.str() == ExpectedPrint1 );
-
- s.del_var("name_str");
-
- bt = 0;
- bt = s.var("name_str", false);
- CPPUNIT_ASSERT( bt == 0 );
-
- w = s.width();
- wsb = +sizeof(dods_int16) + 24 * sizeof(dods_int16);
- CPPUNIT_ASSERT( w == wsb );
-
- ostringstream sstrm2;
- s.print_val(sstrm2);
- CPPUNIT_ASSERT( sstrm2.str() == ExpectedPrint2 );
- }
+ void setUp()
+ {
+ factory = new TestTypeFactory;
+ }
+
+ void tearDown()
+ {
+ delete factory;
+ factory = 0;
+ }
+
+ void structT_test()
+ {
+ TestStructure s("my_structure");
+
+ BaseType *bt = factory->NewInt16("name_int16");
+ s.add_var(bt);
+ delete bt;
+ bt = 0;
+
+ bt = factory->NewStr("name_str");
+ s.add_var(bt);
+ delete bt;
+ bt = 0;
+
+ // TODO Check Does this leak the Int16
+ Array *abt = factory->NewArray("name_array", factory->NewInt16("array_int"));
+ abt->append_dim(4, "dim1");
+ abt->append_dim(3, "dim2");
+ abt->append_dim(2, "dim3");
+ s.add_var(abt);
+ delete abt;
+ abt = 0;
+
+ bt = 0;
+ bt = s.var("name_str", true);
+ CPPUNIT_ASSERT(bt && bt->name() == "name_str");
+
+ bt = 0;
+ bt = s.var("name_str", false);
+ CPPUNIT_ASSERT(bt && bt->name() == "name_str");
+
+ vector<string> varnames;
+ varnames.push_back("name_int16");
+ varnames.push_back("name_str");
+ varnames.push_back("array_int");
+ typedef vector<string>::const_iterator niter;
+
+ Structure::Vars_iter viter = s.var_begin();
+ niter n = varnames.begin();
+ for (; viter != s.var_end() && n != varnames.end(); viter++, n++) {
+ CPPUNIT_ASSERT((*viter)->name() == *n);
+ }
+ CPPUNIT_ASSERT(viter == s.var_end() && n == varnames.end());
+ if (viter != s.var_end() && n == varnames.end()) {
+ CPPUNIT_FAIL("Too many variables");
+ }
+ else if (viter == s.var_end() && n != varnames.end()) {
+ CPPUNIT_FAIL("Too few varialbes");
+ }
+
+ int num_elems = s.element_count();
+ CPPUNIT_ASSERT(num_elems == 3);
+
+ unsigned int w = s.width();
+ unsigned int wsb = sizeof(string) + sizeof(dods_int16) + 24 * sizeof(dods_int16);
+ cerr << "s.width(): " << s.width() << endl;
+ CPPUNIT_ASSERT(w == wsb);
+
+ bool is_read = s.read();
+ CPPUNIT_ASSERT(is_read == true);
+
+ ostringstream sstrm1;
+ s.print_val(sstrm1);
+ CPPUNIT_ASSERT(sstrm1.str() == ExpectedPrint1);
+
+ s.del_var("name_str");
+
+ bt = 0;
+ bt = s.var("name_str", false);
+ CPPUNIT_ASSERT(bt == 0);
+
+ w = s.width();
+ wsb = +sizeof(dods_int16) + 24 * sizeof(dods_int16);
+ CPPUNIT_ASSERT(w == wsb);
+
+ ostringstream sstrm2;
+ s.print_val(sstrm2);
+ CPPUNIT_ASSERT(sstrm2.str() == ExpectedPrint2);
+ }
};
-CPPUNIT_TEST_SUITE_REGISTRATION( structT );
+CPPUNIT_TEST_SUITE_REGISTRATION (structT);
/* NOTHING NEEDS TO BE CHANGED BELOW HERE */
-int main(int, char **)
+int main(int argc, char *argv[])
{
- CppUnit::TextUi::TestRunner runner;
- CppUnit::TestFactoryRegistry ®istry = CppUnit::TestFactoryRegistry::getRegistry();
- runner.addTest(registry.makeTest());
- runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr));
- bool wasSuccessful = runner.run("", false);
- return wasSuccessful ? 0 : 1;
+ GetOpt getopt(argc, argv, "dh");
+ int option_char;
+
+ while ((option_char = getopt()) != -1)
+ switch (option_char) {
+ case 'd':
+ debug = 1; // debug is a static global
+ break;
+
+ case 'h': { // help - show test names
+ cerr << "Usage: structT has the following tests:" << endl;
+ const std::vector<Test*> &tests = structT::suite()->getTests();
+ unsigned int prefix_len = structT::suite()->getName().append("::").length();
+ for (std::vector<Test*>::const_iterator i = tests.begin(), e = tests.end(); i != e; ++i) {
+ cerr << (*i)->getName().replace(0, prefix_len, "") << endl;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+
+ bool wasSuccessful = true;
+ string test = "";
+ int i = getopt.optind;
+ if (i == argc) {
+ // run them all
+ wasSuccessful = runner.run("");
+ }
+ else {
+ for ( ; i < argc; ++i) {
+ if (debug) cerr << "Running " << argv[i] << endl;
+ test = structT::suite()->getName().append("::").append(argv[i]);
+ wasSuccessful = wasSuccessful && runner.run(test);
+ }
+ }
+
+ return wasSuccessful ? 0 : 1;
}
diff --git a/unit-tests/testFile.cc b/unit-tests/testFile.cc
index 6414e22..a71cd43 100644
--- a/unit-tests/testFile.cc
+++ b/unit-tests/testFile.cc
@@ -17,7 +17,7 @@ readTestBaseline(const string &fn)
is.open (fn.c_str(), ios::binary );
if (!is)
- return "Could not read baseline file";
+ return "Could not read baseline file: "+fn;
// get length of file:
is.seekg (0, ios::end);
diff --git a/unit-tests/test_config.h b/unit-tests/test_config.h
index 63f9e57..3814f74 100644
--- a/unit-tests/test_config.h
+++ b/unit-tests/test_config.h
@@ -1,7 +1,7 @@
#ifndef E_test_config_h
#define E_test_config_h
-#define TEST_SRC_DIR "/home/ec2-user/hyrax/libdap4/unit-tests"
+#define TEST_SRC_DIR "/Users/ndp/OPeNDAP/hyrax/libdap4/unit-tests"
#endif
diff --git a/xdr-datatypes.h b/xdr-datatypes.h
index c918cf8..9167595 100644
--- a/xdr-datatypes.h
+++ b/xdr-datatypes.h
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git
More information about the debian-science-commits
mailing list