From b27734c01dce1baea0f4c9283dc40d728c9fdf55 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Mon, 14 Jun 1999 23:23:39 +0200
Subject: [PATCH] testsuite bugfix

Rev: src/modules/Image/module_testsuite.in:1.10
Rev: src/modules/Image/testsuite.in.in:1.18
---
 src/modules/Image/module_testsuite.in | 16 ++++++++--------
 src/modules/Image/testsuite.in.in     | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/modules/Image/module_testsuite.in b/src/modules/Image/module_testsuite.in
index c8ae5d9ebf..5a641b8522 100644
--- a/src/modules/Image/module_testsuite.in
+++ b/src/modules/Image/module_testsuite.in
@@ -478,7 +478,7 @@ if (sizeof(z)!=2)
 do { werror("failure; Image.image/Image.Colortable/colortable - black/white init & cast: "+( "didn't get two colors (black and white): "+((array(string))c)*", " )+"\n"); return 0; } while (0);
 if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
 (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white init & cast: "+( "didn't get black and white: "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white init & cast: "+( "didn't get black and white: "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 return 1;
 
 }
@@ -496,10 +496,10 @@ object c=Image.Colortable(({Image.Color.white,Image.Color.black}));
 img=c*img;
 array z=(array)Image.Colortable(img);
 if (sizeof(z)!=2) 
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white normal: "+( "didn't get two colors (black and white): "+((array(string))c)*", " )+"\n"); return 0; } while (0);
-if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white normal: "+( "didn't get two colors (black and white): "+((array(string))z)*", " )+"\n"); return 0; } while (0);
+if ((z[0]!=Image.Color.black || z1]!=Image.Color.white) &&
 (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white normal: "+( "didn't get black and white: "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white normal: "+( "didn't get black and white: "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 return 1;
 
 }
@@ -518,10 +518,10 @@ c->floyd_steinberg();
 img=c*img;
 array z=(array)Image.Colortable(img);
 if (sizeof(z)!=2) 
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white floyd-steinberg: "+( "didn't get two colors (black and white): "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white floyd-steinberg: "+( "didn't get two colors (black and white): "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
 (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white floyd-steinberg: "+( "didn't get black and white: "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white floyd-steinberg: "+( "didn't get black and white: "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 return 1;
 
 }
@@ -540,10 +540,10 @@ c->ordered();
 img=c*img;
 array z=(array)Image.Colortable(img);
 if (sizeof(z)!=2) 
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white ordered: "+( "didn't get two colors (black and white): "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white ordered: "+( "didn't get two colors (black and white): "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
 (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white ordered: "+( "didn't get black and white: "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white ordered: "+( "didn't get black and white: "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 return 1;
 
 }
diff --git a/src/modules/Image/testsuite.in.in b/src/modules/Image/testsuite.in.in
index 2652422a0c..771fab2d69 100644
--- a/src/modules/Image/testsuite.in.in
+++ b/src/modules/Image/testsuite.in.in
@@ -278,7 +278,7 @@
       fail("didn't get two colors (black and white): "+((array(string))c)*", ");
    if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
        (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-      fail("didn't get black and white: "+((array(string))c)*", ");
+      fail("didn't get black and white: "+((array(string))z)*", ");
    ok();
 
 #test colortable - black/white normal
@@ -287,10 +287,10 @@
    img=c*img;
    array z=(array)Image.Colortable(img);
    if (sizeof(z)!=2) 
-      fail("didn't get two colors (black and white): "+((array(string))c)*", ");
-   if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
+      fail("didn't get two colors (black and white): "+((array(string))z)*", ");
+   if ((z[0]!=Image.Color.black || z1]!=Image.Color.white) &&
        (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-      fail("didn't get black and white: "+((array(string))c)*", ");
+      fail("didn't get black and white: "+((array(string))z)*", ");
    ok();
 
 #test colortable - black/white floyd-steinberg
@@ -300,10 +300,10 @@
    img=c*img;
    array z=(array)Image.Colortable(img);
    if (sizeof(z)!=2) 
-      fail("didn't get two colors (black and white): "+((array(string))c)*", ");
+      fail("didn't get two colors (black and white): "+((array(string))z)*", ");
    if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
        (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-      fail("didn't get black and white: "+((array(string))c)*", ");
+      fail("didn't get black and white: "+((array(string))z)*", ");
    ok();
 
 #test colortable - black/white ordered
@@ -313,10 +313,10 @@
    img=c*img;
    array z=(array)Image.Colortable(img);
    if (sizeof(z)!=2) 
-      fail("didn't get two colors (black and white): "+((array(string))c)*", ");
+      fail("didn't get two colors (black and white): "+((array(string))z)*", ");
    if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
        (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-      fail("didn't get black and white: "+((array(string))c)*", ");
+      fail("didn't get black and white: "+((array(string))z)*", ");
    ok();
 
 #test colortable - standard
-- 
GitLab