Merge pull request #93 from rake-compiler/fix-basic-tests

Fix basic image tests and add them to CI

Author: larskanis

.github/workflows/ci.yml

@@ -74,6 +74,12 @@ jobs:
           bundle exec rake clean clobber
           bundle exec rake gem:${PLATFORM}
 
+      - name: Basic tests on the generated image
+        env:
+          TEST_PLATFORM: ${{ matrix.platform }}
+        run: |
+          bundle exec rake test
+
       - name: Upload binary gem
         uses: actions/upload-artifact@v3
         with:

test/test_environment_variables.rb

@@ -8,7 +8,12 @@
 
 class TestEnvironmentVariables
   module Common
-    IMAGE_NAME = "larskanis/rake-compiler-dock-mri-x86-mingw32:#{RakeCompilerDock::IMAGE_VERSION}"
+    TEST_PLATFORM = ENV["TEST_PLATFORM"] || "x64-mingw-ucrt"
+    DOCKERHUB_USER = ENV['DOCKERHUB_USER'] || "larskanis"
+
+    IS_JRUBY = TEST_PLATFORM.to_s == "jruby"
+    platform = IS_JRUBY ? "jruby" : "mri-#{TEST_PLATFORM}"
+    TEST_IMAGE_NAME = "#{DOCKERHUB_USER}/rake-compiler-dock-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}"
 
     def rcd_env
       self.class.instance_variable_get("@rcd_env") || begin
@@ -23,24 +28,26 @@ def rcd_env
       end
     end
 
-    def test_RUBY_CC_VERSION
-      df = File.read(File.expand_path("../../Dockerfile.mri.erb", __FILE__))
-      df =~ /^ENV RUBY_CC_VERSION\s+(.*)\s+$/
-      assert_equal $1, rcd_env['RUBY_CC_VERSION']
-    end
+    unless IS_JRUBY
+      def test_RUBY_CC_VERSION
+        df = File.read(File.expand_path("../../Dockerfile.mri.erb", __FILE__))
+        df =~ /^ENV RUBY_CC_VERSION\s+(.*)\s+$/
+        assert_equal $1, rcd_env['RUBY_CC_VERSION']
+      end
 
-    def test_RAKE_EXTENSION_TASK_NO_NATIVE
-      assert_equal "true", rcd_env['RAKE_EXTENSION_TASK_NO_NATIVE']
-    end
+      def test_RAKE_EXTENSION_TASK_NO_NATIVE
+        assert_equal "true", rcd_env['RAKE_EXTENSION_TASK_NO_NATIVE']
+      end
 
-    def test_symlink_rake_compiler
-      cmd = invocation("if test -h $HOME/.rake-compiler ; then echo yes ; else echo no ; fi")
-      assert_equal("yes", %x(#{cmd}).strip)
-    end
+      def test_symlink_rake_compiler
+        cmd = invocation("if test -h $HOME/.rake-compiler ; then echo yes ; else echo no ; fi")
+        assert_equal("yes", %x(#{cmd}).strip)
+      end
 
-    def test_gem_directory
-      cmd = invocation("if test -d $HOME/.gem ; then echo yes ; else echo no ; fi")
-      assert_equal("yes", %x(#{cmd}).strip)
+      def test_gem_directory
+        cmd = invocation("if test -d $HOME/.gem ; then echo yes ; else echo no ; fi")
+        assert_equal("yes", %x(#{cmd}).strip)
+      end
     end
   end
 
@@ -49,7 +56,7 @@ class UsingWrapper < Test::Unit::TestCase
 
     def invocation(command)
       idir = File.join(File.dirname(__FILE__), '../lib')
-      "#{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock bash -c '#{command}'"
+      "RCD_PLATFORM=#{TEST_PLATFORM} RCD_RUBYVM=#{IS_JRUBY ? 'jruby' : 'mri'} #{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock bash -c '#{command}'"
     end
 
     def test_HOST_RUBY_PLATFORM
@@ -61,7 +68,7 @@ def test_HOST_RUBY_VERSION
     end
 
     def test_IMAGE
-      assert_equal IMAGE_NAME, rcd_env['RCD_IMAGE']
+      assert_equal TEST_IMAGE_NAME, rcd_env['RCD_IMAGE']
     end
 
     def test_PWD
@@ -73,7 +80,7 @@ class AsIfContinuousIntegration < Test::Unit::TestCase
     include Common
 
     def invocation(command)
-      "docker run -it #{IMAGE_NAME} bash -c '#{command}'"
+      "docker run --rm #{TEST_IMAGE_NAME} bash -c '#{command}'"
     end
   end
 end

test/test_parallel_docker_build.rb

@@ -65,6 +65,6 @@ def test_common_files
   end
 
   def read_df(fn)
-    File.read("tmp/docker/#{fn}").each_line.map(&:lstrip).join
+    File.read(File.join(@tmpdir, "/tmp/docker", fn)).each_line.map(&:lstrip).join
   end
 end