diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2005-09-12 16:24:38 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2005-09-12 16:24:38 +0000 |
| commit | 2055f11ca7015f0032cef8ecf1bf054ce8c1c74d (patch) | |
| tree | eb5c663d0dff91fa3a24157f6ec1ee7a09a3415a /tests/am-subdir.at | |
| parent | ff60e2f2029a1d336e16b3b72e1a2bbebc6ceb4e (diff) | |
| download | libtool-2055f11ca7015f0032cef8ecf1bf054ce8c1c74d.tar.gz | |
Make tagdemo work smoothly with both pre- and ISO C++ compilers,
and remove all use of libstdc from other tests.
* tests/tagdemo/configure.ac (HAVE_NAMESPACES, HAVE_IOSTREAM):
New tests for ISO C++ features. Reimplementation of similar
macros from the autoconf archive.
* tests/tagdemo/foo.cpp, tests/tagdemo/main.cpp: Adjusted.
* tests/am-subdir.at, tests/template.at: Do not use iostream.
Diffstat (limited to 'tests/am-subdir.at')
| -rw-r--r-- | tests/am-subdir.at | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/tests/am-subdir.at b/tests/am-subdir.at index 8c906272..2258121b 100644 --- a/tests/am-subdir.at +++ b/tests/am-subdir.at @@ -129,37 +129,27 @@ subdir_subdemo_LDADD = subdir/libsub.la test -d subdir || { rm -f subdir && mkdir subdir; } AT_DATA([[subdir/sub.hxx]], -[[class libsub { public: void sub (void); }; +[[class libsub { public: int sub (void); }; ]]) AT_DATA([[subdir/main.cxx]], -[[#include <iostream.h> -#include "sub.hxx" +[[#include "sub.hxx" int main (int, char *[]) { libsub SUB; - - cout << "Welcome to GNU Libtool subdir-objects C++ test!" << endl; - SUB.sub(); - return 0; + return SUB.sub() != 27; } ]]) AT_DATA([[subdir/sub.cxx]], -[[#include <iostream.h> -#include "sub.hxx" - -void libsub::sub (void) { cout << "** This is libsub::sub **" << endl; } -]]) +[[#include "sub.hxx" -AT_DATA(expout, -[[Welcome to GNU Libtool subdir-objects C++ test! -** This is libsub::sub ** +int libsub::sub (void) { return 27; } ]]) LT_AT_BOOTSTRAP "${MAKE-make}" -LT_AT_EXEC_CHECK([subdir/subdemo], 0, expout) +LT_AT_EXEC_CHECK([subdir/subdemo], 0) AT_CLEANUP |