Merge pull request diffblue#448 from diffblue/tidy-up-benchmark-shell-scripts

owen-jones-diffblue · web-flow · commit c66d0944b578 · 2018-06-08T11:19:40.000+01:00
Make Sakai.sh use a patch file instead of sed
diff --git a/benchmarks/GENUINE/Sakai.sh b/benchmarks/GENUINE/Sakai.sh
@@ -17,7 +17,7 @@ cd sakai
 git checkout f333f0c
 
 # Revert the sanitiser introduced in 8550c16
-sed -i 's@rv = formattedText.processEscapedHtml(rv);@// rv = formattedText.processEscapedHtml(rv);@' assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
+patch -p0 < $SCRIPT_WORKING_DIR/Sakai_files/remove_sanitiser.patch
 
 # Build Sakai
 mvn install sakai:deploy -Dmaven.tomcat.home="$REPO_DIR/__dist__" -DskipTests -Dmaven.test.skip=true
diff --git a/benchmarks/GENUINE/Sakai_files/remove_sanitiser.patch b/benchmarks/GENUINE/Sakai_files/remove_sanitiser.patch
@@ -0,0 +1,11 @@
+--- assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	2018-06-06 15:39:57.651182570 +0100
++++ assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	2018-06-05 10:14:12.105084905 +0100
+@@ -13556,7 +13556,7 @@
+                 rv = rv.replaceAll("\\r\\n|\\r|\\n", "<br>");
+             }
+             //Escape the html from malicious tags.
+-            rv = formattedText.processEscapedHtml(rv);
++            // rv = formattedText.processEscapedHtml(rv);
+ 
+             int start = rv.indexOf("<body>");
+             int end = rv.indexOf("</body>");
