support reloading broken files with IlmImfFuzzTest

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
AcademySoftwareFoundation · Feb 20, 2020 · 608b493 · 608b493
1 parent d129fae
commit 608b493
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 38 deletions.
diff --git a/OpenEXR/IlmImfFuzzTest/main.cpp b/OpenEXR/IlmImfFuzzTest/main.cpp
@@ -53,7 +53,7 @@
     #include <sstream>
 #endif
 
-#define TEST(x) if (argc < 2 || !strcmp (argv[1], #x)) x();
+#define TEST(x) if (argc < 2 || !strcmp (argv[1], #x)) x(argc==3 ? argv[2] : nullptr);
 
 int
 main (int argc, char *argv[])

diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.cpp b/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.cpp
@@ -408,21 +408,29 @@ fuzzDeepScanLines (int numThreads, Rand48 &random)
 
 
 void
-testFuzzDeepScanLines ()
+testFuzzDeepScanLines (const char* file)
 {
     try
     {
-	cout << "Testing deep scanline-based files "
-		"with randomly inserted errors" << endl;
+        if(file)
+        {
+            readFile(file);
+        }
+        else
+        {
 
-	Rand48 random (1);
+            cout << "Testing deep scanline-based files "
+                    "with randomly inserted errors" << endl;
 
-	fuzzDeepScanLines (0, random);
+            Rand48 random (1);
 
-	if (ILMTHREAD_NAMESPACE::supportsThreads())
-	    fuzzDeepScanLines (2, random);
+            fuzzDeepScanLines (0, random);
 
-	cout << "ok\n" << endl;
+            if (ILMTHREAD_NAMESPACE::supportsThreads())
+                fuzzDeepScanLines (2, random);
+
+            cout << "ok\n" << endl;
+        }
     }
     catch (const std::exception &e)
     {

diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.h b/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.h
@@ -35,5 +35,5 @@
 
 
 
-void testFuzzDeepScanLines ();
+void testFuzzDeepScanLines (const char* file);
 
diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.cpp b/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.cpp
@@ -219,7 +219,7 @@ void generateRandomFile(const char filename[], int channelCount, int parts , Com
                     {
                         for(int x=0;x<data[k].width();x++)
                         {
-                            delete reinterpret_cast<char *>( data[k][y][x] );
+                            delete [] reinterpret_cast<char *>( data[k][y][x] );
                             data[k][y][x]=0;
                         }
                     }
@@ -503,23 +503,30 @@ fuzzDeepTiles (int numThreads, Rand48 &random)
 
 
 void
-testFuzzDeepTiles ()
+testFuzzDeepTiles (const char* file)
 {
 
 
     try
     {
-	cout << "Testing deep tile-based files "
-		"with randomly inserted errors" << endl;
+        if(file)
+        {
+            readFile(file);
+        }
+        else
+        {
+            cout << "Testing deep tile-based files "
+                    "with randomly inserted errors" << endl;
 
-	Rand48 random (1);
+            Rand48 random (1);
 
-	fuzzDeepTiles (0, random);
+            fuzzDeepTiles (0, random);
 
-	if (ILMTHREAD_NAMESPACE::supportsThreads())
-	    fuzzDeepTiles (2, random);
+            if (ILMTHREAD_NAMESPACE::supportsThreads())
+                fuzzDeepTiles (2, random);
 
-	cout << "ok\n" << endl;
+            cout << "ok\n" << endl;
+        }
     }
     catch (const std::exception &e)
     {

diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.h b/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.h
@@ -35,5 +35,5 @@
 
 
 
-void testFuzzDeepTiles ();
+void testFuzzDeepTiles (const char* file);
 
diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzScanLines.cpp b/OpenEXR/IlmImfFuzzTest/testFuzzScanLines.cpp
@@ -252,21 +252,28 @@ fuzzScanLines (int numThreads, Rand48 &random)
 
 
 void
-testFuzzScanLines ()
+testFuzzScanLines (const char* file)
 {
     try
     {
-	cout << "Testing scanline-based files "
-		"with randomly inserted errors" << endl;
+        if(file)
+        {
+            readImage(file);
+        }
+        else
+        {
+            cout << "Testing scanline-based files "
+                    "with randomly inserted errors" << endl;
 
-	Rand48 random (1);
+            Rand48 random (1);
 
-	fuzzScanLines (0, random);
+            fuzzScanLines (0, random);
 
-	if (ILMTHREAD_NAMESPACE::supportsThreads())
-	    fuzzScanLines (2, random);
+            if (ILMTHREAD_NAMESPACE::supportsThreads())
+                fuzzScanLines (2, random);
 
-	cout << "ok\n" << endl;
+            cout << "ok\n" << endl;
+        }
     }
     catch (const std::exception &e)
     {

diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzScanLines.h b/OpenEXR/IlmImfFuzzTest/testFuzzScanLines.h
@@ -35,5 +35,5 @@
 
 
 
-void testFuzzScanLines ();
+void testFuzzScanLines (const char* file);
 
diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzTiles.cpp b/OpenEXR/IlmImfFuzzTest/testFuzzTiles.cpp
@@ -406,21 +406,30 @@ fuzzTiles (int numThreads, Rand48 &random)
 
 
 void
-testFuzzTiles ()
+testFuzzTiles (const char* file)
 {
     try
     {
-	cout << "Testing tile-based files "
-		"with randomly inserted errors" << endl;
+        if(file)
+        {
+            readImageONE(file);
+            readImageMIP(file);
+            readImageRIP(file);
+        }
+        else
+        {
+            cout << "Testing tile-based files "
+                    "with randomly inserted errors" << endl;
 
-	Rand48 random (5);
+            Rand48 random (5);
 
-	fuzzTiles (0, random);
+            fuzzTiles (0, random);
 
-	if (ILMTHREAD_NAMESPACE::supportsThreads())
-	    fuzzTiles (2, random);
+            if (ILMTHREAD_NAMESPACE::supportsThreads())
+                fuzzTiles (2, random);
 
-	cout << "ok\n" << endl;
+            cout << "ok\n" << endl;
+        }
     }
     catch (const std::exception &e)
     {

diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzTiles.h b/OpenEXR/IlmImfFuzzTest/testFuzzTiles.h
@@ -35,5 +35,5 @@
 
 
 
-void testFuzzTiles ();
+void testFuzzTiles (const char* file);