Merge branch 'master' into truffle-head

jruby · May 4, 2015 · 4ab6c57 · 4ab6c57
2 parents fc94c95 + f196dbb
commit 4ab6c57
Showing 10 changed files with 13 additions and 22 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -41,12 +41,12 @@
   jar 'org.ow2.asm:asm-util:${asm.version}'
 
   jar 'com.github.jnr:jnr-netdb:1.1.4'
-  jar 'com.github.jnr:jnr-enxio:0.8'
+  jar 'com.github.jnr:jnr-enxio:0.9'
   jar 'com.github.jnr:jnr-x86asm:1.0.2'
-  jar 'com.github.jnr:jnr-unixsocket:0.7'
-  jar 'com.github.jnr:jnr-posix:3.0.11'
-  jar 'com.github.jnr:jnr-constants:0.8.6'
-  jar 'com.github.jnr:jnr-ffi:2.0.3-SNAPSHOT'
+  jar 'com.github.jnr:jnr-unixsocket:0.8'
+  jar 'com.github.jnr:jnr-posix:3.0.12'
+  jar 'com.github.jnr:jnr-constants:0.8.7'
+  jar 'com.github.jnr:jnr-ffi:2.0.3'
   jar 'com.github.jnr:jffi:${jffi.version}'
   jar 'com.github.jnr:jffi:${jffi.version}:native'
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-enxio</artifactId>
-      <version>0.8</version>
+      <version>0.9</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -100,22 +100,22 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
-      <version>0.7</version>
+      <version>0.8</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.0.12-SNAPSHOT</version>
+      <version>3.0.12</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-constants</artifactId>
-      <version>0.8.6</version>
+      <version>0.8.7</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-ffi</artifactId>
-      <version>2.0.3-SNAPSHOT</version>
+      <version>2.0.3</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

diff --git a/pom.rb b/pom.rb
@@ -59,7 +59,7 @@
               'minitest.version' => '5.4.1',
               'ant.version' => '1.9.2',
               'diff-lcs.version' => '1.1.3',
-              'jffi.version' => '1.2.8',
+              'jffi.version' => '1.2.9',
               'rake.version' => '10.1.0',
               'project.build.sourceEncoding' => 'utf-8',
               'jruby-launcher.version' => '1.1.1',

diff --git a/pom.xml b/pom.xml
@@ -117,7 +117,7 @@
     <minitest.version>5.4.1</minitest.version>
     <ant.version>1.9.2</ant.version>
     <diff-lcs.version>1.1.3</diff-lcs.version>
-    <jffi.version>1.2.8</jffi.version>
+    <jffi.version>1.2.9</jffi.version>
     <rake.version>10.1.0</rake.version>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
     <jruby-launcher.version>1.1.1</jruby-launcher.version>

diff --git a/spec/truffle/tags/core/file/stat/grpowned_tags.txt b/spec/truffle/tags/core/file/stat/grpowned_tags.txt
@@ -1,4 +1 @@
-fails:File::Stat#grpowned? takes non primary groups into account
 fails(windows):File::Stat#grpowned? returns false if the file exist
-fails:File::Stat#grpowned? returns true if the file exist
-fails:File::Stat#grpowned? accepts an object that has a #to_path method
diff --git a/spec/truffle/tags/core/file/stat/pipe_tags.txt b/spec/truffle/tags/core/file/stat/pipe_tags.txt
@@ -1,2 +1 @@
-fails:File::Stat#pipe? returns false if the file is not a pipe
 fails:File::Stat#pipe? returns true if the file is a pipe
diff --git a/spec/truffle/tags/core/file/stat/sticky_tags.txt b/spec/truffle/tags/core/file/stat/sticky_tags.txt
diff --git a/spec/truffle/tags/core/filetest/grpowned_tags.txt b/spec/truffle/tags/core/filetest/grpowned_tags.txt
diff --git a/spec/truffle/tags/core/filetest/sticky_tags.txt b/spec/truffle/tags/core/filetest/sticky_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java
@@ -143,7 +143,7 @@ public int getGroups(int max, RubyBasicObject pointer) {
             final long address = getAddress(pointer);
 
             for (int n = 0; n < groups.length && n < max; n++) {
-                UnsafeHolder.U.putInt(address + n * Unsafe.ARRAY_LONG_INDEX_SCALE, (int) groups[n]);
+                UnsafeHolder.U.putInt(address + n * Unsafe.ARRAY_INT_INDEX_SCALE, (int) groups[n]);
             }
 
             return groups.length;
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:File::Stat#pipe? returns false if the file is not a pipe
		fails:File::Stat#pipe? returns true if the file is a pipe