[llvm-commits] [zorg] r159425 - /zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py

[Duncan Sands]

Author: baldrick
Date: Fri Jun 29 08:06:59 2012
New Revision: 159425

URL: http://llvm.org/viewvc/llvm-project?rev=159425&view=rev
Log:
Have the builder strip out debug info (which contains build directory names)
before doing the comparison.  Replace some tab stops by spaces while there.

Modified:
    zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py?rev=159425&r1=159424&r2=159425&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Fri Jun 29 08:06:59 2012
@@ -66,9 +66,9 @@
                            haltOnFailure=True,
                            workdir='.', env=env))
 
-    gcc_install_dir = 'gcc.install'	# Names are embedded in object files, so
-    llvm_install_dir = 'llvm.install'	# would cause bootstrap comparison fails
-					# if they were different for each stage.
+    gcc_install_dir = 'gcc.install'     # Names are embedded in object files, so
+    llvm_install_dir = 'llvm.install'   # would cause bootstrap comparison fails
+                                        # if they were different for each stage.
 
     # Remove any install directories hanging over from a previous run.
     if clean:
@@ -225,9 +225,12 @@
     # Check that the dragonegg objects didn't change between stages 2 and 3.
     f.addStep(ShellCommand(name='compare.stages',
                            command=['sh', '-c', 'for O in *.o ; do ' +
+                                    'O2=../dragonegg.obj.stage2/$O ; '
+                                    'O3=../dragonegg.obj.stage3/$O ; '
+                                    'strip --strip-debug $O2 -o $O2.no_dbg ; ' +
+                                    'strip --strip-debug $O3 -o $O3.no_dbg ; ' +
                                     'cmp --ignore-initial=16 ' +
-                                    '../dragonegg.obj.stage2/$O ' +
-                                    '../dragonegg.obj.stage3/$O || exit 1 ; ' +
+                                    '$O2.no_dbg $O3.no_dbg || exit 1 ; ' +
                                     'done'],
                            haltOnFailure=True,
                            description='compare stages 2 and 3',