Merge pull request diffblue#344 from diffblue/bugfix/passing_models_lib_to_security_analyser_in_classpath

SEC-252: Bugfix: passing libraries to security-analyser in the classpath.

Author: marek-trtik

driver/run.py

@@ -12,7 +12,7 @@
 def __get_my_dir(): return os.path.dirname(os.path.realpath(__file__))
 
 def __get_benchmark_library_dir(): return os.path.join(__get_my_dir(), "../benchmarks/LIBRARIES")
-def __get_diffblue_models_library_dir(): return os.path.join(__get_benchmark_library_dir(), "models/model/target/classes")
+def __get_diffblue_models_library_package(): return os.path.join(__get_benchmark_library_dir(), "models/model/target/models.jar")
 def __get_tomcat_library_dir(): return os.path.join(__get_benchmark_library_dir(), "apache-tomcat-9/lib")
 
 
@@ -98,16 +98,11 @@ def evaluate(cmdline):
 
     print("Collecting Java binaries to analyse:")
 
-    input_search_dirs = [cmdline.install_dir]
-    if cmdline.use_models_library:
-        input_search_dirs.append(__get_diffblue_models_library_dir())
-    if cmdline.use_tomcat_library:
-        input_search_dirs.append(__get_tomcat_library_dir())
-
     classes_jar_pathname = os.path.abspath(os.path.join(cmdline.results_dir, "program.json"))
     prof["collect_java_binaries"] = mkbench.collect_java_binaries(
-        input_search_dirs,
-        cmdline.libraries,
+        [cmdline.install_dir],
+        cmdline.libraries + ([__get_diffblue_models_library_package()] if cmdline.use_models_library else [])
+                          + ([__get_tomcat_library_dir()] if cmdline.use_tomcat_library else []),
         cmdline.temp_dir,
         classes_jar_pathname,
         cmdline.verbosity
@@ -243,9 +238,9 @@ def __main():
               analyser.get_missing_binary_error_message())
         return
 
-    if cmdline.use_models_library and not os.path.isdir(__get_diffblue_models_library_dir()):
+    if cmdline.use_models_library and not os.path.isfile(__get_diffblue_models_library_package()):
         print("ERROR: Models library not found at %s; consider running 'make' in %s" % (
-                __get_diffblue_models_library_dir(), os.path.realpath(os.path.join(__get_my_dir(), ".."))))
+                __get_diffblue_models_library_package(), os.path.realpath(os.path.join(__get_my_dir(), ".."))))
         return
     if cmdline.use_tomcat_library and not os.path.isdir(__get_tomcat_library_dir()):
         print("ERROR: Tomcat 9 library was not found at " + __get_tomcat_library_dir() + "")