From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 26 Aug 2005 10:00:18 +0000 (+0000)
Subject: * tests/standalone.at, tests/template.at: Do not compare
X-Git-Tag: release-2-1b~553
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a305c3d9f4a67e95e427fa6d6d234f38d42098db;p=thirdparty%2Flibtool.git

* tests/standalone.at, tests/template.at: Do not compare
output because of EOL issues.  Resolve warnings, make cross-
compilation aware.
Reported by Peter Ekberg <peda@axentia.se>.
---

diff --git a/ChangeLog b/ChangeLog
index 4389f53a7..f17d81472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* tests/standalone.at, tests/template.at: Do not compare
+	output because of EOL issues.  Resolve warnings, make cross-
+	compilation aware.
+	Reported by Peter Ekberg <peda@axentia.se>.
+
 	* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)
 	(_LT_LINKER_SHLIBS): Double-quote unsafe tag variable
 	descriptions: they are literals.
diff --git a/tests/standalone.at b/tests/standalone.at
index 39c955099..02809b07b 100644
--- a/tests/standalone.at
+++ b/tests/standalone.at
@@ -74,7 +74,7 @@ AT_CLEANUP
 AT_SETUP([linking libltdl without autotools])
 
 AT_DATA([module.c],
-[[char *
+[[const char *
 hello (void)
 {
   return "Hello!";
@@ -89,7 +89,7 @@ int
 main (int argc, char **argv)
 {
   lt_dlhandle handle;
-  char *(*func) (void) = 0;
+  const char *(*func) (void) = 0;
   int status = 1;
 
   LTDL_SET_PRELOADED_SYMBOLS();
@@ -104,7 +104,7 @@ main (int argc, char **argv)
     goto finish;
   }
 
-  func = (char *(*)(void)) lt_dlsym (handle, "hello");
+  func = (const char *(*)(void)) lt_dlsym (handle, "hello");
   if (!func) {
     fprintf (stderr, "error fetching func: %s\n", lt_dlerror());
     goto finish;
@@ -154,10 +154,6 @@ LT_AT_LIBTOOLIZE([--copy --ltdl])
 ${MAKE-make} CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \
         CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 
-AT_DATA([expout],
-[[Hello!
-]])
-
-AT_CHECK([./ltdldemo], 0, expout)
+LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore])
 
 AT_CLEANUP
diff --git a/tests/template.at b/tests/template.at
index 9ae27d620..9b18f4f62 100644
--- a/tests/template.at
+++ b/tests/template.at
@@ -73,7 +73,7 @@ int main()
   cout << "a sample prog" << endl;
   cout << "f(3) = " << f(3) << endl;
   cout << "cf(3) = " << cf(3) << endl;
-  return 0;
+  return (f(3) + 3 - cf(3) != 0);
 }
 ]])
 
@@ -84,10 +84,7 @@ AT_CHECK($LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS -o libalib.la -
 AT_CHECK($CXX -I. $CPPFLAGS $CXXFLAGS -c -o prog.o prog.cpp, [0], [ignore], [ignore])
 AT_CHECK($LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS -o prog prog.o libalib.la, [0], [ignore], [ignore])
 
-LT_AT_EXEC_CHECK([./prog], [0], [a sample prog
-f(3) = 6
-cf(3) = 9
-], [ignore])
+LT_AT_EXEC_CHECK([./prog], [0], [ignore], [ignore])
 
 
 dnl with autoreconf, use: