[GR-15940] Clone the graal-enterprise version matching our Truffle import.

PullRequest: truffleruby/851

Author: eregon

ci.jsonnet

@@ -138,7 +138,6 @@ local part_definitions = {
       is_after+:: ["$.use.build"],
       setup+: [
         ["cd", "../graal/compiler"],
-        ["mx", "sversions"],
         ["mx", "build"],
         ["cd", "../../main"],
       ],
@@ -159,18 +158,20 @@ local part_definitions = {
     },
 
     enterprise: {
-      # Otherwise the TruffleRuby build will change the runtime Truffle version
       is_after+:: ["$.use.build"],
-      setup+: [
-        [
-          "git",
-          "clone",
-          ["mx", "urlrewrite", "https://github.com/graalvm/graal-enterprise.git"],
-          "../graal-enterprise",
-        ],
+
+      clone::
+      local url = ["mx", "urlrewrite", "https://github.com/graalvm/graal-enterprise.git"],
+            repo = "../graal-enterprise",
+            suite_file = "graal-enterprise/mx.graal-enterprise/suite.py",
+            find_commit_importing_truffle = ["git", "-C", repo, "log", "--reverse", "--pretty=%H", "-m", "-S"] + jt(["truffle_version"]) + ["--grep=PullRequest:", suite_file, "|", "head", "-1"];
+      [
+        ["git", "clone", url, repo],
+        ["git", "-C", repo, "checkout", find_commit_importing_truffle],
+      ],
+
+      setup+: self.clone + [
         ["cd", "../graal-enterprise/graal-enterprise"],
-        ["mx", "sforceimports"],
-        ["mx", "sversions"],
         ["mx", "build"],
         ["cd", "../../main"],
       ],
@@ -198,13 +199,6 @@ local part_definitions = {
 
       svm_suite:: "/substratevm",
 
-      setup+: [
-        ["cd", "../graal/substratevm"],
-        ["mx", "sforceimports"],
-        ["mx", "sversions"],
-        ["cd", "../../main"],
-      ],
-
       environment+: {
         HOST_VM_CONFIG: "graal-core",
         GRAAL_HOME: "$BUILD_DIR/graal/compiler",
@@ -213,23 +207,11 @@ local part_definitions = {
     },
 
     enterprise: {
-      # Otherwise the TruffleRuby build will change the runtime Truffle version
       is_after+:: ["$.use.build"],
 
       svm_suite:: "/substratevm-enterprise",
 
-      setup+: [
-        [
-          "git",
-          "clone",
-          ["mx", "urlrewrite", "https://github.com/graalvm/graal-enterprise.git"],
-          "../graal-enterprise",
-        ],
-        ["cd", "../graal-enterprise/substratevm-enterprise"],
-        ["mx", "sforceimports"],
-        ["mx", "sversions"],
-        ["cd", "../../main"],
-      ],
+      setup+: $.graal.enterprise.clone,
 
       environment+: {
         HOST_VM_CONFIG: "graal-enterprise",

spec/ruby/library/socket/fixtures/classes.rb

@@ -72,24 +72,11 @@ def self.each_ip_protocol
   end
 
   def self.loop_with_timeout(timeout = TIME_TOLERANCE)
-    require 'timeout'
-    time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-    loop do
-      if Process.clock_gettime(Process::CLOCK_MONOTONIC) - time >= timeout
-        raise TimeoutError, "Did not succeed within #{timeout} seconds"
-      end
-
-      sleep 0.01 # necessary on OSX; don't know why
-      yield
-    end
-  end
-
-  def self.wait_until_success(timeout = TIME_TOLERANCE)
-    loop_with_timeout(timeout) do
-      begin
-        return yield
-      rescue
+    while yield == :retry
+      if Process.clock_gettime(Process::CLOCK_MONOTONIC) - start >= timeout
+        raise RuntimeError, "Did not succeed within #{timeout} seconds"
       end
     end
   end

spec/ruby/library/socket/socket/tcp_server_loop_spec.rb

@@ -31,8 +31,13 @@
         end
       end
 
-      SocketSpecs.wait_until_success do
-        @client.connect(Socket.sockaddr_in(@port, '127.0.0.1'))
+      SocketSpecs.loop_with_timeout do
+        begin
+          @client.connect(Socket.sockaddr_in(@port, '127.0.0.1'))
+        rescue SystemCallError
+          sleep 0.01
+          :retry
+        end
       end
 
       # At this point the connection has been set up but the thread may not yet

spec/ruby/library/socket/socket/udp_server_loop_spec.rb

@@ -35,9 +35,17 @@
       @client.connect(Socket.sockaddr_in(@port, '127.0.0.1'))
 
       SocketSpecs.loop_with_timeout do
-        SocketSpecs.wait_until_success { @client.write('hello') }
-
-        break if msg
+        begin
+          @client.write('hello')
+        rescue SystemCallError
+          sleep 0.01
+          :retry
+        else
+          unless msg
+            sleep 0.001
+            :retry
+          end
+        end
       end
 
       msg.should == 'hello'

spec/ruby/library/socket/socket/unix_server_loop_spec.rb

@@ -39,7 +39,14 @@
           end
         end
 
-        @client = SocketSpecs.wait_until_success { Socket.unix(@path) }
+        SocketSpecs.loop_with_timeout do
+          begin
+            @client = Socket.unix(@path)
+          rescue SystemCallError
+            sleep 0.01
+            :retry
+          end
+        end
 
         thread.join(2)
 

spec/tags/library/socket/socket/tcp_server_loop_tags.txt

@@ -0,0 +1 @@
+darwin(spurious):Socket.tcp_server_loop when a connection is available yields a Socket and an Addrinfo

tool/jt.rb

@@ -622,6 +622,10 @@ def help
     TXT
   end
 
+  def truffle_version
+    puts super
+  end
+
   def mx(*args)
     super(*args)
   end