cloudfoundry#135 disable memory calculator

jcanopui · Feb 21, 2018 · ced5af7 · ced5af7
1 parent 7f50d3b
commit ced5af7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lib/java_buildpack/jre/open_jdk_like_memory_calculator.rb b/lib/java_buildpack/jre/open_jdk_like_memory_calculator.rb
@@ -51,9 +51,10 @@ def compile
       #
       # @return [String] the memory calculation command
       def memory_calculation_command
-        "CALCULATED_MEMORY=$(#{memory_calculation_string(@droplet.root)}) && " \
-        'echo JVM Memory Configuration: $CALCULATED_MEMORY && ' \
-        'JAVA_OPTS="$JAVA_OPTS $CALCULATED_MEMORY"'
+		'JAVA_OPTS="$JAVA_OPTS"'
+#        "CALCULATED_MEMORY=$(#{memory_calculation_string(@droplet.root)}) && " \
+#        'echo JVM Memory Configuration: $CALCULATED_MEMORY && ' \
+#        'JAVA_OPTS="$JAVA_OPTS $CALCULATED_MEMORY"'
       end
 
       # (see JavaBuildpack::Component::BaseComponent#release)

diff --git a/spec/java_buildpack/jre/open_jdk_like_memory_calculator_spec.rb b/spec/java_buildpack/jre/open_jdk_like_memory_calculator_spec.rb
@@ -82,10 +82,11 @@
 
     command = component.memory_calculation_command
 
-    expect(command).to eq('CALCULATED_MEMORY=$($PWD/.java-buildpack/open_jdk_like_memory_calculator/bin/' \
-                            'java-buildpack-memory-calculator-0.0.0 -totMemory=$MEMORY_LIMIT -stackThreads=200 ' \
-                            '-loadedClasses=2 -poolType=metaspace -vmOptions="$JAVA_OPTS") && echo JVM Memory ' \
-                            'Configuration: $CALCULATED_MEMORY && JAVA_OPTS="$JAVA_OPTS $CALCULATED_MEMORY"')
+	expect(command).to eq('JAVA_OPTS="$JAVA_OPTS"')
+#    expect(command).to eq('CALCULATED_MEMORY=$($PWD/.java-buildpack/open_jdk_like_memory_calculator/bin/' \
+#                            'java-buildpack-memory-calculator-0.0.0 -totMemory=$MEMORY_LIMIT -stackThreads=200 ' \
+#                            '-loadedClasses=2 -poolType=metaspace -vmOptions="$JAVA_OPTS") && echo JVM Memory ' \
+#                            'Configuration: $CALCULATED_MEMORY && JAVA_OPTS="$JAVA_OPTS $CALCULATED_MEMORY"')
   end
 
   it 'does not throw an error when a directory ends in .jar',