[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Petter Reinholdtsen |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1957-g5fb7cfd |
|
Date: |
Sun, 27 Apr 2014 06:16:06 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 5fb7cfd6a1701581d3d49e2f15786ec5479d8c45 (commit)
from 473b30867e7acdc997887134a5769f9026320e99 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=5fb7cfd6a1701581d3d49e2f15786ec5479d8c45
commit 5fb7cfd6a1701581d3d49e2f15786ec5479d8c45
Author: Petter Reinholdtsen <address@hidden>
Date: Sat Apr 26 23:57:32 2014 +0200
Add more code to handle exceptions in test code. Addresses several
Coverity CID reports usin the macro TRYMAIN() to handle the exceptions.
diff --git a/testsuite/libbase.all/NoSeekFileTest.cpp
b/testsuite/libbase.all/NoSeekFileTest.cpp
index b5afe95..5f0388c 100644
--- a/testsuite/libbase.all/NoSeekFileTest.cpp
+++ b/testsuite/libbase.all/NoSeekFileTest.cpp
@@ -22,9 +22,8 @@
#ifdef HAVE_DEJAGNU_H
#include "dejagnu.h"
-#else
-#include "check.h"
#endif
+#include "check.h"
#include "noseek_fd_adapter.h"
#include "IOChannel.h"
@@ -128,8 +127,9 @@ compare_reads(gnash::IOChannel* reader, int fd, const char*
first, const char* s
}
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
const char* input = INPUT; // Should be the path to this file
const char* cachename = "NoSeekFileTestCache";
diff --git a/testsuite/libbase.all/RcTest.cpp b/testsuite/libbase.all/RcTest.cpp
index 0542b6d..4b06569 100644
--- a/testsuite/libbase.all/RcTest.cpp
+++ b/testsuite/libbase.all/RcTest.cpp
@@ -42,9 +42,8 @@
#ifdef HAVE_DEJAGNU_H
#include "dejagnu.h"
-#else
-#include "check.h"
#endif
+#include "check.h"
using namespace std;
using namespace gnash;
@@ -62,8 +61,9 @@ bool nodelay = false; // FIXME: this flag gets set
based on
TestState runtest;
+TRYMAIN(runtest);
int
-main (int /*argc*/, char** /*argv*/) {
+trymain (int /*argc*/, char** /*argv*/) {
RcInitFile& rc = RcInitFile::getDefaultInstance();
gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
diff --git a/testsuite/libbase.all/URLTest.cpp
b/testsuite/libbase.all/URLTest.cpp
index 593387e..18a8b89 100644
--- a/testsuite/libbase.all/URLTest.cpp
+++ b/testsuite/libbase.all/URLTest.cpp
@@ -30,8 +30,9 @@
using namespace std;
using namespace gnash;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
//gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
//dbglogfile.setVerbosity(2);
diff --git a/testsuite/libbase.all/string_tableTest.cpp
b/testsuite/libbase.all/string_tableTest.cpp
index 263ea27..ca537d5 100644
--- a/testsuite/libbase.all/string_tableTest.cpp
+++ b/testsuite/libbase.all/string_tableTest.cpp
@@ -33,8 +33,10 @@
#include "utility.h"
using namespace gnash;
+
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string_table st;
diff --git a/testsuite/libcore.all/AsValueTest.cpp
b/testsuite/libcore.all/AsValueTest.cpp
index d3c10bc..bc622ed 100644
--- a/testsuite/libcore.all/AsValueTest.cpp
+++ b/testsuite/libcore.all/AsValueTest.cpp
@@ -27,6 +27,7 @@
#include "ManualClock.h"
#include "movie_definition.h"
#include "dejagnu.h"
+#include "check.h"
#include "as_value.h"
#include "StreamProvider.h"
#include "as_object.h"
@@ -60,8 +61,9 @@ TestState runtest;
LogFile& dbglogfile = LogFile::getDefaultInstance();
RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+TRYMAIN(_runtest);
int
-main(int argc, char *argv[])
+trymain(int argc, char *argv[])
{ const Arg_parser::Option opts[] =
{
{ 'h', "help", Arg_parser::no },
diff --git a/testsuite/libcore.all/BitsReaderTest.cpp
b/testsuite/libcore.all/BitsReaderTest.cpp
index 7def689..0f2e580 100644
--- a/testsuite/libcore.all/BitsReaderTest.cpp
+++ b/testsuite/libcore.all/BitsReaderTest.cpp
@@ -75,8 +75,9 @@ struct ByteReader
};
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
ByteReader in(0xAA);
diff --git a/testsuite/libcore.all/DisplayListTest.cpp
b/testsuite/libcore.all/DisplayListTest.cpp
index 43484be..ed07372 100644
--- a/testsuite/libcore.all/DisplayListTest.cpp
+++ b/testsuite/libcore.all/DisplayListTest.cpp
@@ -43,8 +43,9 @@
using namespace std;
using namespace gnash;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity();
diff --git a/testsuite/libcore.all/PropertyListTest.cpp
b/testsuite/libcore.all/PropertyListTest.cpp
index a6014e0..ad85b10 100644
--- a/testsuite/libcore.all/PropertyListTest.cpp
+++ b/testsuite/libcore.all/PropertyListTest.cpp
@@ -55,8 +55,9 @@ getVal(PropertyList& p, const ObjectURI& k, as_value& val,
as_object& obj)
return false;
}
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
cout << "sizeof(Property): " << sizeof(Property) << endl;
cout << "sizeof(PropertyList): " << sizeof(PropertyList) << endl;
diff --git a/testsuite/libcore.all/SafeStackTest.cpp
b/testsuite/libcore.all/SafeStackTest.cpp
index 8a4f0b2..9af81fb 100644
--- a/testsuite/libcore.all/SafeStackTest.cpp
+++ b/testsuite/libcore.all/SafeStackTest.cpp
@@ -37,8 +37,9 @@ using namespace gnash;
using std::cout;
using std::endl;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
SafeStack<int> st;
diff --git a/testsuite/libcore.all/StreamTest.cpp
b/testsuite/libcore.all/StreamTest.cpp
index 1dd818f..fb9cbed 100644
--- a/testsuite/libcore.all/StreamTest.cpp
+++ b/testsuite/libcore.all/StreamTest.cpp
@@ -106,8 +106,9 @@ struct ByteReader : public IOChannel
};
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity(1);
diff --git a/testsuite/misc-ming.all/BeginBitmapFillRunner.cpp
b/testsuite/misc-ming.all/BeginBitmapFillRunner.cpp
index fac8601..7890e17 100644
--- a/testsuite/misc-ming.all/BeginBitmapFillRunner.cpp
+++ b/testsuite/misc-ming.all/BeginBitmapFillRunner.cpp
@@ -34,8 +34,9 @@ using namespace gnash;
using namespace gnash::geometry;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/BitmapDataTestRunner.cpp
b/testsuite/misc-ming.all/BitmapDataTestRunner.cpp
index 2f68270..8ecfa6a 100644
--- a/testsuite/misc-ming.all/BitmapDataTestRunner.cpp
+++ b/testsuite/misc-ming.all/BitmapDataTestRunner.cpp
@@ -34,8 +34,9 @@ using namespace gnash;
using namespace gnash::geometry;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
b/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
index 9a73699..70b41fa 100644
--- a/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
+++ b/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
@@ -225,8 +225,9 @@ test_mouse_activity(MovieTester& tester, const TextField*
text, const TextField*
}
}
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
//string filename = INPUT_FILENAME;
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
diff --git a/testsuite/misc-ming.all/ButtonPropertiesTestRunner.cpp
b/testsuite/misc-ming.all/ButtonPropertiesTestRunner.cpp
index 3c04685..8fc48b0 100644
--- a/testsuite/misc-ming.all/ButtonPropertiesTestRunner.cpp
+++ b/testsuite/misc-ming.all/ButtonPropertiesTestRunner.cpp
@@ -35,8 +35,9 @@
using namespace gnash;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp
b/testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp
index 8ba67d8..614b3eb 100644
--- a/testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp
+++ b/testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp
@@ -34,8 +34,9 @@
using namespace gnash;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp
b/testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp
index dee94b3..b76862a 100644
--- a/testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp
+++ b/testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp
@@ -34,8 +34,9 @@
using namespace gnash;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = INPUT_FILENAME;
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
b/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
index 90cee91..0793095 100644
--- a/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
+++ b/testsuite/misc-ming.all/DefineTextTest-Runner.cpp
@@ -36,8 +36,9 @@
using namespace gnash;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/DragDropTestRunner.cpp
b/testsuite/misc-ming.all/DragDropTestRunner.cpp
index 2cee7a6..f6140b5 100644
--- a/testsuite/misc-ming.all/DragDropTestRunner.cpp
+++ b/testsuite/misc-ming.all/DragDropTestRunner.cpp
@@ -41,8 +41,9 @@ using namespace gnash;
using namespace gnash::geometry;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/DrawingApiTestRunner.cpp
b/testsuite/misc-ming.all/DrawingApiTestRunner.cpp
index db4af7d..d4b9554 100644
--- a/testsuite/misc-ming.all/DrawingApiTestRunner.cpp
+++ b/testsuite/misc-ming.all/DrawingApiTestRunner.cpp
@@ -68,8 +68,9 @@ inscribedRect(int x, int y, int radius)
return ret;
}
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
std::string filename =
std::string(TGTDIR) + "/" + std::string(INPUT_FILENAME);
diff --git a/testsuite/misc-ming.all/KeyEventOrderRunner.cpp
b/testsuite/misc-ming.all/KeyEventOrderRunner.cpp
index ce9dfd0..db8e76f 100644
--- a/testsuite/misc-ming.all/KeyEventOrderRunner.cpp
+++ b/testsuite/misc-ming.all/KeyEventOrderRunner.cpp
@@ -35,8 +35,9 @@
using namespace gnash;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
b/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
index d7a02e5..a222053 100644
--- a/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
+++ b/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
@@ -38,8 +38,9 @@
using namespace gnash;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/PrototypeEventListenersTestRunner.cpp
b/testsuite/misc-ming.all/PrototypeEventListenersTestRunner.cpp
index 1d9ebe1..0d53ff9 100644
--- a/testsuite/misc-ming.all/PrototypeEventListenersTestRunner.cpp
+++ b/testsuite/misc-ming.all/PrototypeEventListenersTestRunner.cpp
@@ -39,8 +39,9 @@ using namespace gnash;
using namespace gnash::geometry;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/ResolveEventsTest-Runner.cpp
b/testsuite/misc-ming.all/ResolveEventsTest-Runner.cpp
index 88a48f7..657ed72 100644
--- a/testsuite/misc-ming.all/ResolveEventsTest-Runner.cpp
+++ b/testsuite/misc-ming.all/ResolveEventsTest-Runner.cpp
@@ -35,8 +35,9 @@
using namespace gnash;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
//string filename = INPUT_FILENAME;
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
diff --git a/testsuite/misc-ming.all/RollOverOutTest-Runner.cpp
b/testsuite/misc-ming.all/RollOverOutTest-Runner.cpp
index 322e658..6c42d4a 100644
--- a/testsuite/misc-ming.all/RollOverOutTest-Runner.cpp
+++ b/testsuite/misc-ming.all/RollOverOutTest-Runner.cpp
@@ -34,8 +34,9 @@
using namespace gnash;
using namespace std;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
MovieTester tester(filename);
diff --git a/testsuite/misc-ming.all/replace_buttons1test_runner.cpp
b/testsuite/misc-ming.all/replace_buttons1test_runner.cpp
index 9bb24a7..3da3a57 100644
--- a/testsuite/misc-ming.all/replace_buttons1test_runner.cpp
+++ b/testsuite/misc-ming.all/replace_buttons1test_runner.cpp
@@ -35,8 +35,9 @@ using namespace gnash;
using namespace std;
using namespace gnash::geometry;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
typedef gnash::geometry::SnappingRanges2d<int> Ranges;
typedef gnash::geometry::Range2d<int> Bounds;
diff --git a/testsuite/misc-ming.all/replace_shapes1test_runner.cpp
b/testsuite/misc-ming.all/replace_shapes1test_runner.cpp
index c848749..fce1f36 100644
--- a/testsuite/misc-ming.all/replace_shapes1test_runner.cpp
+++ b/testsuite/misc-ming.all/replace_shapes1test_runner.cpp
@@ -35,8 +35,9 @@ using namespace gnash;
using namespace std;
using namespace gnash::geometry;
+TRYMAIN(_runtest);
int
-main(int /*argc*/, char** /*argv*/)
+trymain(int /*argc*/, char** /*argv*/)
{
typedef gnash::geometry::SnappingRanges2d<int> Ranges;
typedef gnash::geometry::Range2d<int> Bounds;
-----------------------------------------------------------------------
Summary of changes:
testsuite/libbase.all/NoSeekFileTest.cpp | 6 +++---
testsuite/libbase.all/RcTest.cpp | 6 +++---
testsuite/libbase.all/URLTest.cpp | 3 ++-
testsuite/libbase.all/string_tableTest.cpp | 4 +++-
testsuite/libcore.all/AsValueTest.cpp | 4 +++-
testsuite/libcore.all/BitsReaderTest.cpp | 3 ++-
testsuite/libcore.all/DisplayListTest.cpp | 3 ++-
testsuite/libcore.all/PropertyListTest.cpp | 3 ++-
testsuite/libcore.all/SafeStackTest.cpp | 3 ++-
testsuite/libcore.all/StreamTest.cpp | 3 ++-
testsuite/misc-ming.all/BeginBitmapFillRunner.cpp | 3 ++-
testsuite/misc-ming.all/BitmapDataTestRunner.cpp | 3 ++-
.../misc-ming.all/ButtonEventsTest-Runner.cpp | 3 ++-
.../misc-ming.all/ButtonPropertiesTestRunner.cpp | 3 ++-
.../misc-ming.all/DefineEditTextTest-Runner.cpp | 3 ++-
.../DefineEditTextVariableNameTest-Runner.cpp | 3 ++-
testsuite/misc-ming.all/DefineTextTest-Runner.cpp | 3 ++-
testsuite/misc-ming.all/DragDropTestRunner.cpp | 3 ++-
testsuite/misc-ming.all/DrawingApiTestRunner.cpp | 3 ++-
testsuite/misc-ming.all/KeyEventOrderRunner.cpp | 3 ++-
.../misc-ming.all/NetStream-SquareTestRunner.cpp | 3 ++-
.../PrototypeEventListenersTestRunner.cpp | 3 ++-
.../misc-ming.all/ResolveEventsTest-Runner.cpp | 3 ++-
testsuite/misc-ming.all/RollOverOutTest-Runner.cpp | 3 ++-
.../misc-ming.all/replace_buttons1test_runner.cpp | 3 ++-
.../misc-ming.all/replace_shapes1test_runner.cpp | 3 ++-
26 files changed, 56 insertions(+), 30 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1957-g5fb7cfd,
Petter Reinholdtsen <=