fix-up specs now that JAVA_OPTS is multi-line

trinidad · Jul 1, 2014 · 959abea · 959abea
1 parent 97bfd71
commit 959abea
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/spec/trinidad_init_services/configuration_spec.rb b/spec/trinidad_init_services/configuration_spec.rb
@@ -49,7 +49,7 @@
 
     init_file_content = File.read(init_file)
 
-    java_opts = init_file_content.match(/JAVA_OPTS=(.*)$/)
+    java_opts = init_file_content.match(/JAVA_OPTS="(.*?)"/m)
     expect( java_opts ).to_not be nil
     expect( java_opts = java_opts[1] ).to_not be nil
     expect( java_opts ).to include '-XX:+UseCodeCacheFlushing'
@@ -72,7 +72,7 @@
 
     init_file_content = File.read(init_file)
 
-    java_opts = init_file_content.match(/JAVA_OPTS=(.*)$/)
+    java_opts = init_file_content.match(/JAVA_OPTS="(.*?)"/m)
     expect( java_opts ).to_not be nil
     expect( java_opts = java_opts[1] ).to_not be nil
     expect( java_opts ).to include '-XX:+UseCodeCacheFlushing'
@@ -90,7 +90,7 @@
 
     init_file_content = File.read(init_file)
 
-    java_opts = init_file_content.match(/JAVA_OPTS=(.*)$/)[1]
+    java_opts = init_file_content.match(/JAVA_OPTS="(.*?)"/m)[1]
     expect( java_opts ).to_not be nil
     expect( code_cache_size = java_opts.match(/-XX:ReservedCodeCacheSize=(.*)m/)[1] ).to_not be nil
     if java_version =~ /^1\.(6|7)/