A re-worked version of the performance testing framework.

utilities/LoadTesting/scripts/_mergeTestResults

@@ -0,0 +1,42 @@
+#! /usr/bin/ruby
+
+=begin
+--------------------------------------------------------------------------------
+
+Look through the test results for the currently-selected version, and merge them
+into an HTML file so we can easily compare them.
+
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+=end
+
+require "#{File.dirname(__FILE__)}/subscripts/loadParms"
+require "#{File.dirname(__FILE__)}/subscripts/test_result_merger"
+
+properties  = {}
+
+source_dir = "/home/jeb228/LoadTesting/testinfo/results/#{@site_name}"
+properties["source_directory"] = source_dir
+properties["target_directory"] = "/var/www/html/loadTesting/"
+properties["site_name"] = "#{@site_name}"
+
+suggestions = []
+if File.directory?(source_dir)
+  Dir.chdir(source_dir) do |dir|
+    if File.file?("fileOrderSuggestions.txt")
+      File.open("fileOrderSuggestions.txt") do |f|
+        f.each_line() do |line|
+          suggestions.push(line.strip())
+        end
+      end
+    end
+  end
+end
+properties["file_order_suggestions"] = suggestions
+
+trm = TestResultMerger.new(properties)
+trm.merge
+
+puts "TestResultMerger was successful."
+
+