[cfe-commits] r62637 - in /cfe/trunk/tools/ccc: ccclib/Driver.py test/ccc/hello.c

[Daniel Dunbar]

Author: ddunbar
Date: Tue Jan 20 18:05:15 2009
New Revision: 62637

URL: http://llvm.org/viewvc/llvm-project?rev=62637&view=rev
Log:
ccc: Unbreak -pipe handling broken in previous refactoring.

Modified:
    cfe/trunk/tools/ccc/ccclib/Driver.py
    cfe/trunk/tools/ccc/test/ccc/hello.c

Modified: cfe/trunk/tools/ccc/ccclib/Driver.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/ccclib/Driver.py?rev=62637&r1=62636&r2=62637&view=diff

==============================================================================
--- cfe/trunk/tools/ccc/ccclib/Driver.py (original)
+++ cfe/trunk/tools/ccc/ccclib/Driver.py Tue Jan 20 18:05:15 2009
@@ -685,8 +685,8 @@
                 jobList = inputs[0].source
                 
             baseInput = inputs[0].baseInput
-            output = self.getOutputName(phase, outputToPipe, jobs, jobList, baseInput, 
-                                        args, atTopLevel, hasSaveTemps, finalOutput)
+            output,jobList = self.getOutputName(phase, outputToPipe, jobs, jobList, baseInput, 
+                                                args, atTopLevel, hasSaveTemps, finalOutput)
             tool.constructJob(phase, arch, jobList, inputs, output, phase.type,
                               tcArgs, linkingOutput)
 
@@ -762,4 +762,4 @@
                 fd,filename = tempfile.mkstemp(suffix='.'+phase.type.tempSuffix)
                 output = args.makeSeparateArg(filename,
                                               self.parser.oOption)
-        return output
+        return output,jobList

Modified: cfe/trunk/tools/ccc/test/ccc/hello.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/test/ccc/hello.c?rev=62637&r1=62636&r2=62637&view=diff

==============================================================================
--- cfe/trunk/tools/ccc/test/ccc/hello.c (original)
+++ cfe/trunk/tools/ccc/test/ccc/hello.c Tue Jan 20 18:05:15 2009
@@ -1,5 +1,7 @@
 // RUN: xcc %s -o %t &&
 // RUN: %t | grep "Hello, World" &&
+// RUN: xcc %s -o %t -pipe &&
+// RUN: %t | grep "Hello, World" &&
 // RUN: xcc -ccc-clang %s -o %t &&
 // RUN: %t | grep "Hello, World"