Fix issues caused by Image module (chapel-lang#25050)

Fixes issues caused by merging
chapel-lang#24924 in nightly testing.

This PR also includes an improvement to a skipif for a future, unrelated
to the Image module.

Tested by running a full paratest with/without gasnet

[Reviewed by @DanilaFe]

test/exercises/c-ray/c-ray.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/old/c-ray.chpl

@@ -23,7 +23,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use IO;       // allows access to stderr, stdin, ioMode
 use List;
 use ChplConfig;

test/exercises/c-ray/old/c-ray.noreal.good

@@ -1 +1 @@
-../Image.chpl:37: error: pixelType must be an integral type
+../CRayImage.chpl:37: error: pixelType must be an integral type

test/exercises/c-ray/old/c-ray.toosmall.good

@@ -1 +1 @@
-../Image.chpl:33: error: pixelType 'int(8)' isn't big enough to store 8 bits per color
+../CRayImage.chpl:33: error: pixelType 'int(8)' isn't big enough to store 8 bits per color

test/exercises/c-ray/solutions/c-ray-1.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-1a.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-2.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-2a.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-3.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-3a.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-4.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-4a.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-5.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-6.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-7.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/exercises/c-ray/solutions/c-ray-8.chpl

@@ -24,7 +24,7 @@
  * ----------------------------------------------------------------------------
  */
 
-use Image;    // use helper module related to writing out images
+use CRayImage;    // use helper module related to writing out images
 use List;
 use IO;       // allow use of stderr, stdin, ioMode
 import Math.pi;

test/functions/generic/type-func-return-generic.future

@@ -1,2 +1,4 @@
 bug: type functions should not segfault when return generic types
 #25039
+
+When resolving this future, remove the skipif

test/functions/generic/type-func-return-generic.skipif

@@ -0,0 +1,2 @@
+# this works fine on linux64
+CHPL_TARGET_PLATFORM==linux64

test/library/packages/Image/smallMovie.skipif

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ ! command -v ffmpeg &> /dev/null ]; then
+if ! command -v ffmpeg &> /dev/null; then
   echo True;
 else
   echo False;