0
@@ -29,7 +29,6 @@ print = function(txt) { Ruby.puts(txt); };
0
   
0
   window.__defineSetter__("location", function(url){
0
     var xhr = new XMLHttpRequest();
0
-    xhr.async = false;
0
     xhr.open("GET", url);
0
     xhr.onreadystatechange = function(){
0
       curLocation = curLocation.merge(url);
0
@@ -652,7 +651,6 @@ print = function(txt) { Ruby.puts(txt); };
0
       }
0
 
0
       if (this.async)
0
-        // FIXME: This is segfaulting
0
         new Ruby.Thread(function() { makeRequest(); });
0
       else
0
         makeRequest();

0
@@ -9,9 +9,18 @@ module Johnson
0
 
0
     def test_set_location_returns_location
0
       filename = "file://#{File.expand_path(__FILE__)}"
0
-      @runtime.evaluate("window.location = '#{filename}'")
0
+
0
+      may_thread {
0
+        @runtime.evaluate("window.location = '#{filename}'")
0
+      }
0
+
0
       uri = URI.parse(filename)
0
       assert_equal(uri.to_s, @runtime.evaluate('window.location').to_s)
0
     end
0
+
0
+    def may_thread(&block)
0
+      block.call
0
+      (Thread.list - [Thread.main]).each { |t| t.join }
0
+    end
0
   end
0
 end