[llvm-commits] [zorg] r152249 - /zorg/trunk/lnt/lnt/tests/compile.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed Mar  7 16:12:01 2012
New Revision: 152249

URL: http://llvm.org/viewvc/llvm-project?rev=152249&view=rev
Log:
[LNT] lnt.tests.compile: Override SHARED_PRECOMPS_DIR to force PCH files to go
into the build dir.
 - Avoids a hack (see rm'd FIXME) and fixes a problem where the JavaScriptCore
   build would still use a PCH file in a shared directory.

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

Modified: zorg/trunk/lnt/lnt/tests/compile.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/compile.py?rev=152249&r1=152248&r2=152249&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/compile.py (original)
+++ zorg/trunk/lnt/lnt/tests/compile.py Wed Mar  7 16:12:01 2012
@@ -320,6 +320,7 @@
         cmd.append('OBJROOT=%s' % (os.path.join(build_base, 'obj')))
         cmd.append('SYMROOT=%s' % (os.path.join(build_base, 'sym')))
         cmd.append('DSTROOT=%s' % (os.path.join(build_base, 'dst')))
+        cmd.append('SHARED_PRECOMPS_DIR=%s' % (os.path.join(build_base, 'pch')))
 
         # Add arguments to force the appropriate compiler.
         cmd.append('CC=%s' % (opts.cc,))
@@ -349,13 +350,7 @@
                  for arg in cmd))
     stdout_path = os.path.join(output_base, "stdout.log")
     stderr_path = os.path.join(output_base, "stderr.log")
-    # FIXME: I haven't figured out how to prevent Xcode from putting some data
-    # (shared PCH files, notably) in the derived data folder. There is most
-    # likely a command line setting to override this, but I don't know it
-    # yet. Until then, we just blow away the users entire DerivedData folder!
-    preprocess_cmd = 'rm -rf "%s" "%s"' % (
-        build_base,
-        os.path.expanduser("~/Library/Developer/Xcode/DerivedData"))
+    preprocess_cmd = 'rm -rf "%s"' % (build_base,)
 
     # FIXME: It might be a good idea to audit the stdout files here from the
     # build system and check that they are "about" the same. For example, I