Merge pull request diffblue#82 from trtikm/trtikm/december_demo_sprint

Bug-fixes: making taint analyser working correctly after the clean-ups; Improved documentation files.

Author: NathanJPhillips

regression/december_demo_sprint/DSpace/APP/README.txt

@@ -19,9 +19,9 @@ Installation on Ubuntu:
       git clone https://github.com/DSpace/DSpace
 2. Enter the directory type the following commands:
       git checkout 462ed4437c2f60812af1c207d8309212dbf893f6 .
-      cd DSpace
       mvn clean package
 3. Copy built binaries into the installation directory by typing this command
    into the terminal:
+      cd ..
       python ./copy_binaries.py
 

regression/december_demo_sprint/Encuestame/APP/README.txt

@@ -29,7 +29,6 @@ Installation on Ubuntu:
       git clone https://github.com/smowton/encuestame/
 2. Rename the created directory "encuestame" to "Encuestame"
 3. Enter the directory and build with maven:
-      cd Encuestame/
       git checkout taint_analysis .
       mvn clean package -DskipTests
 4. Copy the resulting files to ../BENCHMARK (relative path to this README.txt

regression/december_demo_sprint/Openolat/APP/README.txt

@@ -1,24 +1,28 @@
 Openolat
 ~~~~~~~~
 
-OpenOLAT is a learning platform offering an extensive set of features that is written in Java.
-The code is open source and is hosted on a public Mercurial repository.
+OpenOLAT is a learning platform offering an extensive set of features that is
+written in Java. The code is open source and is hosted on a public Mercurial
+repository.
 
 Home web: http://www.openolat.com/
 Repo URL: http://hg.openolat.org/openolat105/
 
 Installation on Ubuntu:
 
 1. Install TortoiseHg (http://tortoisehg.bitbucket.org/)
-2. Use TortoiseHg to clone the OpenOlat source code from http://hg.openolat.org/openolat105/
-3. Open terminal in the directory where you cloned OpenOlat into and type there: mvn clean package
-
-The resulting WAR file "openolat-lms-10.5-SNAPSHOT.war" is then located in the sub-directory: ./target
-
-!!! Copy the resulting WAR/JAR file(s) to ../BENCHMARK directory (relative path to this README.txt file)
-    to be consistent with structure of this evaluation !!!
+2. Use TortoiseHg to clone the OpenOlat source code from:
+        http://hg.openolat.org/openolat105/
+3. Update to revision: 6509
+4. Open terminal in the directory where you cloned OpenOlat into and type there:
+        mvn clean package
+5. Copy content of the created sub-directory "target" into a directory
+   "../../BENCHMARK". Note that the destination directory perhaps does not
+   exist (so create it then).
 
 ----
 
-Note: There is a GIT fork of Openolat (https://github.com/klemens/openolat.git). I tried to build the
-      commit ece4e16b2567e7b62da8c578bf8b7a6b09766579, but the build has failed. So, do not use it!!
+Note: There is a GIT fork of Openolat (https://github.com/klemens/openolat.git).
+      I tried to build the commit ece4e16b2567e7b62da8c578bf8b7a6b09766579, but
+      the build has failed. So, do not use it!!
+

regression/december_demo_sprint/TOY_APPS/Fotoalbum/APP/README.txt

@@ -12,7 +12,6 @@ Repository: https://github.com/foto-andreas/slideshow
       git clone https://github.com/foto-andreas/slideshow
 2. Rename the created directory "slideshow" to "Fotoalbum"
 3. Enter the directory and checkout the right commit:
-      cd Fotoalbum/
       git checkout 924a537fce365a19b7db84bb542143acbc771e6b .
 4. Build with maven:
       mvn clean package

regression/december_demo_sprint/TOY_APPS/SuggestionBox/APP/README.txt

@@ -13,7 +13,7 @@ Installation on Ubuntu:
 
 1. Open a terminal in the directory of this readme file and clone:
       git clone https://github.com/Tirrumala/SuggestionBox
-2. Enter the directory and build with maven:
+2. Then type this commands to build the application:
       cd SuggestionBox/SuggestionBox/
       git checkout  a55074e07008c1a50042f472694d465db182d874 .
       mvn clean package

regression/december_demo_sprint/TOY_APPS/mediaManager/APP/README.txt

@@ -19,7 +19,6 @@ Installation on Ubuntu:
 1. Open a terminal in the directory of this readme file and clone:
       git clone https://github.com/jamescoll/mediaManager
 2. Enter the directory and checkout the right commit:
-      cd mediaManager/
       git checkout bd8ffff7d4116d06a9ddfc6f53c2283ce18034bf .
 3. And build the application with maven:
       mvn clean package

regression/december_demo_sprint/TRAINING/taint_traces_04/APP/taint_traces_04/Main.java

@@ -1,23 +1,33 @@
 public class Main {
 
+  public void dummy_alloc() {
+    OtherBase1 dummy1 = new OtherBase1();
+    OtherBase2 dummy2 = new OtherBase2();
+    Other dummy3 = new Other();
+  }
+
   public OtherBase1  foo() {
+    dummy_alloc();
     OtherBase1 ptr = new Other();
     return ptr;
   }
 
   public void  baz0() {
+    dummy_alloc();
     OtherBase1 ptr = foo();
     int i = ptr.someMethod();
     taint_sink_X1_arg_0(i);
   }
 
   public void  baz1() {
+    dummy_alloc();
     Other ptr = new Other();
     int i = ptr.someMethod();
     taint_sink_X1_arg_0(i);
   }
 
   public void  baz2(Other ptr) {
+    dummy_alloc();
     int i = ptr.someMethod();
     taint_sink_X1_arg_0(i);
   }

report_from_both_demos/.gitignore

@@ -0,0 +1,5 @@
+*.aux
+*.log
+*.synctex.gz
+report_from_November_and_December_demos.pdf
+