[Lldb-commits] [PATCH] D21032: Eliminate differences in lldbinline-generated Makefiles and ensure they're regenerated every time

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Tue Jun 7 14:47:56 PDT 2016


labath added subscribers: zturner, labath.
labath added a comment.

Hi, I have reverted this commit, as it makes a number of assumptions, which are not true on windows. Please see comments for details.

If you need help testing out a revised version on windows, let me know. I think Zachary will be able to help with that as well (:P).


================
Comment at: packages/Python/lldbsuite/test/lldbinline.py:135
@@ +134,3 @@
+        if os.path.exists("Makefile"):
+            if not filecmp.cmp("Makefile", "Makefile.tmp"):
+                sys.exit("Existing Makefile doesn't match generated Makefile!")
----------------
This files will not end up being identical, due to different path separators and newlines when this is being run on windows.

I like the idea of diffing, but it needs to be done in a way that it will work on windows.

================
Comment at: packages/Python/lldbsuite/test/lldbinline.py:136
@@ +135,3 @@
+            if not filecmp.cmp("Makefile", "Makefile.tmp"):
+                sys.exit("Existing Makefile doesn't match generated Makefile!")
+
----------------
This will not cause the error to be reported in the test runner. See <http://lab.llvm.org:8011/builders/lldb-windows7-android/builds/6268/steps/test1/logs/stdio> where, this code is triggered, but the test is still not marked as failed in the summary at the end. I think throwing an exception here would do the expected thing.

================
Comment at: packages/Python/lldbsuite/test/lldbinline.py:138
@@ +137,3 @@
+
+        os.rename("Makefile.tmp", "Makefile")    
+
----------------
Windows does not support in-place renames, so this will just fail.


Repository:
  rL LLVM

http://reviews.llvm.org/D21032





More information about the lldb-commits mailing list