[llvm-commits] [zorg] r114583 - /zorg/trunk/lnt/lnt/tests/nt.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed Sep 22 16:10:19 2010
New Revision: 114583

URL: http://llvm.org/viewvc/llvm-project?rev=114583&view=rev
Log:
LNT/nt: Add --liblto-path command line option, which does the extra setup necessary to test libLTO (currently by overriding DYLD_LIBRARY_PATH under the covers).

Modified:
    zorg/trunk/lnt/lnt/tests/nt.py

Modified: zorg/trunk/lnt/lnt/tests/nt.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/nt.py?rev=114583&r1=114582&r2=114583&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Wed Sep 22 16:10:19 2010
@@ -114,6 +114,10 @@
         make_variables['SMALL_PROBLEM_SIZE'] = '1'
     if opts.test_integrated_as:
         make_variables['TEST_INTEGRATED_AS'] = '1'
+    if opts.liblto_path:
+        make_variables['LD_ENV_OVERRIDES'] = (
+            'env DYLD_LIBRARY_PATH=%s' % os.path.dirname(
+                opts.liblto_path))
 
     if opts.threads > 1:
         make_variables['ENABLE_PARALLEL_REPORT'] = '1'
@@ -593,6 +597,11 @@
         group.add_option("", "--isysroot", dest="isysroot", metavar="PATH",
                          help="Set -isysroot in TARGET_FLAGS [%default]",
                          type=str, default=None)
+        group.add_option("", "--liblto-path", dest="liblto_path",
+                         metavar="PATH",
+                         help=("Specify the path to the libLTO library "
+                               "[%default]"),
+                         type=str, default=None)
 
         group.add_option("", "--mcpu", dest="mcpu",
                          help="Set -mcpu in TARGET_LLCFLAGS [%default]",
@@ -751,6 +760,12 @@
             if opts.remote_user is None:
                 parser.error('--remote-user is required with --remote')
 
+        # libLTO should exist, if given.
+        if opts.liblto_path:
+            if not os.path.exists(opts.liblto_path):
+                parser.error('invalid --liblto-path argument %r' % (
+                        opts.liblto_path,))
+
         # FIXME: We need to validate that there is no configured output in the
         # test-suite directory, that borks things. <rdar://problem/7876418>