Add test_ust_java_agent_vs_tools

[deliverable/lttng-ivc.git] / lttng_ivc / utils / project.py

diff --git a/lttng_ivc/utils/project.py b/lttng_ivc/utils/project.py
index f508c31cd591b912ed2bbc60eeec9e3234466142..71d17e2a14d79c48c3b790be177b5305a8257d1c 100644 (file)
--- a/lttng_ivc/utils/project.py
+++ b/lttng_ivc/utils/project.py
@@ -34,6 +34,7 @@ class Project(object):
         self.isBuilt = False
         self.isConfigured = False
         self.isInstalled = False
+        self.skip = False
 
         self.basedir = tmpdir
         self.log_path = os.path.join(tmpdir, "log")
@@ -282,7 +283,7 @@ class Lttng_modules(Project):
     def __init__(self, label, git_path, sha1, tmpdir):
         super(Lttng_modules, self).__init__(label=label, git_path=git_path,
                                             sha1=sha1, tmpdir=tmpdir)
-        self.add_special_env_variable("MODPROBE_OPTIONS","-b {}".format(self.installation_path))
+        self.add_special_env_variable("MODPROBE_OPTIONS","-d {}".format(self.installation_path))
 
     def bootstrap(self):
         pass
@@ -312,6 +313,13 @@ class Lttng_ust(Project):
         super(Lttng_ust, self).__init__(label=label, git_path=git_path,
                                         sha1=sha1, tmpdir=tmpdir)
         self.custom_configure_flags.extend(['--disable-man-pages'])
+        self.custom_configure_flags.extend(['--enable-python-agent'])
+        self.custom_configure_flags.extend(['--enable-java-agent-jul'])
+
+        jul_path = os.path.join(self.installation_path,
+                "share/java/liblttng-ust-agent.jar")
+        classpath = ":".join([jul_path, Settings.log4j_class_path, '.'])
+        self.add_special_env_variable("CLASSPATH", classpath)
 
 
 class Lttng_tools(Project):