Merge 51571605-disable-memory-heuristics to master

Glyn Normington · Glyn Normington · commit ce4e974ba22c · 2013-06-12T16:41:27.000+01:00
[Completes #51571605]
diff --git a/lib/java_buildpack/jre/openjdk.rb b/lib/java_buildpack/jre/openjdk.rb
@@ -44,15 +44,15 @@ def initialize(context = {})
     #
     # @return [String, nil] returns +jre-<vendor>-<version>+.
     def detect
-      memory_sizes # drive out errors early
+      # memory_sizes # drive out errors early
       id @details
     end
 
     # Downloads and unpacks a JRE
     #
     # @return [void]
     def compile
-      memory_sizes # drive out errors early
+      # memory_sizes # drive out errors early
       application_cache = JavaBuildpack::Util::ApplicationCache.new
 
       download_start_time = Time.now
@@ -68,9 +68,9 @@ def compile
     #
     # @return [void]
     def release
-      memory_sizes.each do |memory_size|
-        @java_opts << memory_size
-      end
+      #memory_sizes.each do |memory_size|
+      #  @java_opts << memory_size
+      #end
     end
 
     private
diff --git a/spec/java_buildpack/jre/openjdk_spec.rb b/spec/java_buildpack/jre/openjdk_spec.rb
@@ -19,7 +19,11 @@
 
 module JavaBuildpack::Jre
 
-  describe OpenJdk do
+  RSpec.configure do |c|
+    c.filter_run_excluding :waiting_for_memory_limit_support => true
+  end
+
+  describe OpenJdk, :waiting_for_memory_limit_support => true do
 
     HEAP_SIZE = '1G'
 
