Changeset 8bdc1c36

Timestamp:

Aug 20, 2018, 12:52:03 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

341bb80

Parents:

b215e92b

Message:

Now using rpath to handle shared libraries instead of LD_LIBRARY_PATH

Files:

• driver/cfa.cc (modified) (1 diff)
• tests/pybin/settings.py (modified) (2 diffs)
• tests/test.py (modified) (1 diff)

driver/cfa.cc

@@ -416 +416 @@
                 args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
                 nargs += 1;
+                args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+                nargs += 1;
                 args[nargs] = "-lcfa";
                 nargs += 1;

tests/pybin/settings.py

@@ -112 +112 @@
         global install
         global timeout
-        global ldpath
 
         dry_run    = options.dry_run
@@ -121 +120 @@
         arch       = Architecture(options.arch)
         timeout    = Timeouts(options.timeout, options.global_timeout)
-        ldpath     = "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH:%s/../libcfa/%s-%s/src/.libs\"" % (BUILDDIR, arch.string, "debug" if options.debug else "nodebug")
 
 

tests/test.py

@@ -162 +162 @@
                 if settings.dry_run or fileIsExecutable(exe_file) :
                         # run test
-                        retcode, _ = sh("%s timeout %d %s > %s 2>&1" % (settings.ldpath, settings.timeout.single, exe_file, out_file), input = in_file)
+                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
                 else :
                         # simply cat the result into the output