AC_LANG_CPLUSPLUS so we build this test case with G++.
* aclocal.m4, configure: Regenerated.
* dejagnu.h: Don't use testout(), have each method print the array
value directly, which is much simpler.
* acinclude.m4(DJ_AC_STL): s/for for/for/.
* dejagnu.h: Add conditional support for sstream.
(testout): Likewise. Make return type `const'.
+2001-05-28 Rob Savoye <rob@peggyo.welcomehome.org>
+
+ * acinclude.m4(DJ_AC_STL): Also use
+ AC_LANG_CPLUSPLUS so we build this test case with G++.
+ * aclocal.m4, configure: Regenerated.
+ * dejagnu.h: Don't use testout(), have each method print the array
+ value directly, which is much simpler.
+
+2001-05-27 Jeffrey Oldham <oldham@codesourcery.com>
+
+ * acinclude.m4(DJ_AC_STL): s/for for/for/.
+ * dejagnu.h: Add conditional support for sstream.
+ (testout): Likewise. Make return type `const'.
+
2001-05-25 Rob Savoye <rob@peggyo.welcomehome.org>
* acinclude.m4: Add DJ_AC_STL, which figures out if we're running
AUTOMAKE_OPTIONS = dejagnu
# Install all the associated data files
-SUBDIRS = doc testsuite example
+SUBDIRS = doc testsuite example
# Install the bourne shell script driver in the bindir
bin_SCRIPTS = runtest
CXX = @CXX@
DOCBOOK = @DOCBOOK@
EXEEXT = @EXEEXT@
+LEX = @LEX@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
TCLSH = @TCLSH@
VERSION = @VERSION@
+YACC = @YACC@
tclsh = @tclsh@
AUTOMAKE_OPTIONS = dejagnu
# Install all the associated data files
-SUBDIRS = doc testsuite example
+SUBDIRS = doc testsuite example
# Install the bourne shell script driver in the bindir
bin_SCRIPTS = runtest
AC_DEFUN(DJ_AC_STL, [
-AC_MSG_CHECKING(for for STL versions)
+AC_MSG_CHECKING(for STL versions)
AC_CACHE_VAL(ac_cv_stl,[
+ AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <iostream>], [
using namespace std;
char bbuuff[5120];
),
])
+AC_LANG_C
if test x"${ac_cv_stl}" != x"v2" ; then
AC_MSG_RESULT(v3)
AC_DEFINE(HAVE_STL3)
dnl PARTICULAR PURPOSE.
AC_DEFUN(DJ_AC_STL, [
-AC_MSG_CHECKING(for for STL versions)
+AC_MSG_CHECKING(for STL versions)
AC_CACHE_VAL(ac_cv_stl,[
+ AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <iostream>], [
using namespace std;
char bbuuff[5120];
),
])
+AC_LANG_C
if test x"${ac_cv_stl}" != x"v2" ; then
AC_MSG_RESULT(v3)
AC_DEFINE(HAVE_STL3)
-echo $ac_n "checking for for STL versions""... $ac_c" 1>&6
-echo "configure:1789: checking for for STL versions" >&5
+echo $ac_n "checking for STL versions""... $ac_c" 1>&6
+echo "configure:1789: checking for STL versions" >&5
if eval "test \"`echo '$''{'ac_cv_stl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+ ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
cat > conftest.$ac_ext <<EOF
-#line 1795 "configure"
+#line 1802 "configure"
#include "confdefs.h"
#include <iostream>
int main() {
cout.rdbuf()->pubsetbuf(bbuuff, 5120);
; return 0; }
EOF
-if { (eval echo configure:1805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_stl=v3
fi
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
if test x"${ac_cv_stl}" != x"v2" ; then
echo "$ac_t""v3" 1>&6
cat >> confdefs.h <<\EOF
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile doc/Makefile testsuite/Makefile example/Makefile
-testsuite/libdejagnu/Makefile unitparse/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+testsuite/libdejagnu/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile testsuite/Makefile example/Makefile
-testsuite/libdejagnu/Makefile unitparse/Makefile"}
+testsuite/libdejagnu/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
AC_CONFIG_SUBDIRS(example/calc)
AC_OUTPUT(Makefile doc/Makefile testsuite/Makefile example/Makefile
-testsuite/libdejagnu/Makefile unitparse/Makefile)
+testsuite/libdejagnu/Makefile)
#include <iomanip>
#include <fstream>
#include <string>
+#if HAVE_STL3
+#include <sstream>
+#else
#include <strstream>
+#endif
char *outstate[] = {
"FAILED: ",
}
#endif
-char *testout (int x) {
- using namespace std;
- const int len = 128;
- static char buf[len];
- static ostrstream oss(buf, len, ios::out);
- oss.seekp(ios::beg);
- oss << outstate[x] << ends;
- return buf;
-}
-
enum teststate {FAILED, PASSED,UNTESTED,UNRESOLVED} laststate;
class TestState {
totals();
};
-
void testrun (bool b, std::string s) {
if (b)
pass (s);
passed++;
laststate = PASSED;
lastmsg = s;
- std::cout << "\t" << testout(PASSED) << s << std::endl;
+ std::cout << "\t" << outstate[PASSED] << s << std::endl;
}
void pass (const char *c) {
std::string s = c;
failed++;
laststate = FAILED;
lastmsg = s;
- std::cout << "\t" << testout(FAILED) << s << std::endl;
+ std::cout << "\t" << outstate[FAILED] << s << std::endl;
}
void fail (const char *c) {
std::string s = c;
untest++;
laststate = UNTESTED;
lastmsg = s;
- std::cout << "\t" << testout(UNTESTED) << s << std::endl;
+ std::cout << "\t" << outstate[UNTESTED] << s << std::endl;
}
void untested (const char *c) {
std::string s = c;
unresolve++;
laststate = UNRESOLVED;
lastmsg = s;
- std::cout << "\t" << testout(UNRESOLVED) << s << std::endl;
+ std::cout << "\t" << outstate[UNRESOLVED] << s << std::endl;
}
void unresolved (const char *c) {
std::string s = c;
CONFIG = @CONFIG@
CXX = @CXX@
EXEEXT = @EXEEXT@
+LEX = @LEX@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
TCLSH = @TCLSH@
VERSION = @VERSION@
+YACC = @YACC@
tclsh = @tclsh@
man_MANS = runtest.1
CXX = @CXX@
DOCBOOK = @DOCBOOK@
EXEEXT = @EXEEXT@
+LEX = @LEX@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
TCLSH = @TCLSH@
VERSION = @VERSION@
+YACC = @YACC@
tclsh = @tclsh@
AUTOMAKE_OPTIONS = dejagnu
CXX = @CXX@
DOCBOOK = @DOCBOOK@
EXEEXT = @EXEEXT@
+LEX = @LEX@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
TCLSH = @TCLSH@
VERSION = @VERSION@
+YACC = @YACC@
tclsh = @tclsh@
AUTOMAKE_OPTIONS = dejagnu
CXX = @CXX@
DOCBOOK = @DOCBOOK@
EXEEXT = @EXEEXT@
+LEX = @LEX@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
TCLSH = @TCLSH@
VERSION = @VERSION@
+YACC = @YACC@
tclsh = @tclsh@
CFLAGS = -I$(top_srcdir) -g