[Gnash-commit] gnash ChangeLog testsuite/check.h testsuite/lib... [release_0_7_2]

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Rob Savoye <rsavoye>    06/11/05 00:20:43

Modified files:
        .              : ChangeLog 
        testsuite      : check.h 
        testsuite/libbase: NoSeekFileTest.cpp URLTest.cpp 
        testsuite/server: GetterSetterTest.cpp MatrixTest.cpp 
                          PropertyListTest.cpp 

Log message:
                * testsuite/check.h: Include config.h. Optionally include
                dejagnu.h. Add stubs if it's not found.
                * testsuite/libbase/NoSeekFileTest.cpp: Include
                config.h. Optionally include either dejagnu.h or check.h.
                * testsuite/libbase/URLTest.cpp: Include
                config.h. Optionally include either dejagnu.h or check.h.
                * testsuite/server/GetterSetterTest.cpp: Include
                config.h. Optionally include either dejagnu.h or check.h.
                * testsuite/server/MatrixTest.cpp: Include
                config.h. Optionally include either dejagnu.h or check.h.
                * testsuite/server/PropertyListTest.cpp: Include
                config.h. Optionally include either dejagnu.h or check.h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.79&r2=1.1412.2.80
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/check.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/NoSeekFileTest.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/URLTest.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.10.2.1&r2=1.10.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/GetterSetterTest.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/MatrixTest.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/PropertyListTest.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.2.2.1&r2=1.2.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.79
retrieving revision 1.1412.2.80
diff -u -b -r1.1412.2.79 -r1.1412.2.80
--- ChangeLog   4 Nov 2006 22:51:13 -0000       1.1412.2.79
+++ ChangeLog   5 Nov 2006 00:20:42 -0000       1.1412.2.80
@@ -1,3 +1,18 @@
+2006-11-04  Rob Savoye  <address@hidden>
+
+       * testsuite/check.h: Include config.h. Optionally include
+       dejagnu.h. Add stubs if it's not found.
+       * testsuite/libbase/NoSeekFileTest.cpp: Include
+       config.h. Optionally include either dejagnu.h or check.h.
+       * testsuite/libbase/URLTest.cpp: Include
+       config.h. Optionally include either dejagnu.h or check.h.
+       * testsuite/server/GetterSetterTest.cpp: Include
+       config.h. Optionally include either dejagnu.h or check.h.
+       * testsuite/server/MatrixTest.cpp: Include
+       config.h. Optionally include either dejagnu.h or check.h.
+       * testsuite/server/PropertyListTest.cpp: Include
+       config.h. Optionally include either dejagnu.h or check.h.
+
 2006-11-04 Sandro Santilli <address@hidden>
 
        * server/sprite_instance.cpp (ctor): code cleanup.

Index: testsuite/check.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/check.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- testsuite/check.h   10 Oct 2006 17:02:17 -0000      1.3
+++ testsuite/check.h   5 Nov 2006 00:20:42 -0000       1.3.2.1
@@ -1,12 +1,28 @@
 #ifndef _CHECK_H_
 #define _CHECK_H_
 
-#include <dejagnu.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sstream>
+#include <iostream>
 #include <string>
 
-TestState _runtest;
+#ifdef HAVE_DEJAGNU_H
+#include "dejagnu.h"
+#else
+#warning "You should install DejaGnu! Using stubs for pass/fail..."
+class TestState 
+{
+ public:
+  void pass(std::string s) { std::cout << "PASSED: " << s << std::endl;  };
+  void fail(std::string s) { std::cout << "FAILED: " << s << std::endl;  };
+};
 
+#endif
+
+TestState _runtest;
 #define check_equals_label(label, expr, expected) \
        { \
                std::stringstream ss; \

Index: testsuite/libbase/NoSeekFileTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/NoSeekFileTest.cpp,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- testsuite/libbase/NoSeekFileTest.cpp        4 Nov 2006 18:51:10 -0000       
1.2.2.2
+++ testsuite/libbase/NoSeekFileTest.cpp        5 Nov 2006 00:20:42 -0000       
1.2.2.3
@@ -15,7 +15,15 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_DEJAGNU_H
+#include "dejagnu.h"
+#else
+#include "check.h"
+#endif
 
 #include "noseek_fd_adapter.h"
 #include "tu_file.h"
@@ -29,7 +37,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <dejagnu.h>
 #include <sstream>
 
 using namespace std;

Index: testsuite/libbase/URLTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/URLTest.cpp,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- testsuite/libbase/URLTest.cpp       30 Oct 2006 14:28:55 -0000      1.10.2.1
+++ testsuite/libbase/URLTest.cpp       5 Nov 2006 00:20:42 -0000       1.10.2.2
@@ -14,12 +14,12 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-
-#include "URL.h"
-#include "dejagnu.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "check.h"
+#include "URL.h"
 #include <iostream>
 #include <sstream>
 #include <cassert>

Index: testsuite/server/GetterSetterTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/GetterSetterTest.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- testsuite/server/GetterSetterTest.cpp       30 Oct 2006 14:28:55 -0000      
1.1.2.1
+++ testsuite/server/GetterSetterTest.cpp       5 Nov 2006 00:20:42 -0000       
1.1.2.2
@@ -14,14 +14,16 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#include "check.h"
 #include "GetterSetter.h"
 #include "builtin_function.h"
 #include "as_object.h"
 #include "as_value.h"
 #include "fn_call.h"
-#include "dejagnu.h"
 #include "log.h"
 
 #include "check.h"

Index: testsuite/server/MatrixTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/MatrixTest.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- testsuite/server/MatrixTest.cpp     30 Oct 2006 14:28:55 -0000      1.1.2.1
+++ testsuite/server/MatrixTest.cpp     5 Nov 2006 00:20:42 -0000       1.1.2.2
@@ -14,12 +14,12 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-
-#include "matrix.h"
-#include "dejagnu.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "check.h"
+#include "matrix.h"
 #include <iostream>
 #include <sstream>
 #include <cassert>

Index: testsuite/server/PropertyListTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/PropertyListTest.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- testsuite/server/PropertyListTest.cpp       30 Oct 2006 14:28:55 -0000      
1.2.2.1
+++ testsuite/server/PropertyListTest.cpp       5 Nov 2006 00:20:42 -0000       
1.2.2.2
@@ -14,15 +14,16 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#include "check.h"
 #include "PropertyList.h"
 #include "as_object.h" // need to set as owner of PropertyList
 #include "as_value.h"
-#include "dejagnu.h"
 #include "log.h"
 
-#include "check.h"
 #include <iostream>
 #include <sstream>
 #include <cassert>