Author: labath
Date: Tue Jun 7 16:29:46 2016
New Revision: 272062
URL: http://llvm.org/viewvc/llvm-project?rev=272062&view=rev
Log:
Revert "Make lldbinline.py regenerate the Makefile each time it builds."
This reverts commit r272024 as it is not windows-compatible.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile
lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
lldb/trunk/packages/Python/lldbsuite/test/lldbinline.py
lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
Tue Jun 7 16:29:46 2016
@@ -1,13 +1,12 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
+
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
+# targets. Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
+ CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
-
-
-cleanup:
- rm -f Makefile *.d
-
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
Tue Jun 7 16:29:46 2016
@@ -1,13 +1,4 @@
LEVEL = ../../../make
OBJC_SOURCES := main.m
-LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
-ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
-endif
-
include $(LEVEL)/Makefile.rules
-
-
-cleanup:
- rm -f Makefile *.d
-
+LDFLAGS += -framework Foundation
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
Tue Jun 7 16:29:46 2016
@@ -1,13 +1,12 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
+
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
+# targets. Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
+ CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
-
-
-cleanup:
- rm -f Makefile *.d
-
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
Tue Jun 7 16:29:46 2016
@@ -1,13 +1,4 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
-ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
-endif
-
include $(LEVEL)/Makefile.rules
-
-
-cleanup:
- rm -f Makefile *.d
-
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile Tue
Jun 7 16:29:46 2016
@@ -1,12 +1,3 @@
LEVEL = ../../../make
C_SOURCES := main.c
-ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
-endif
-
include $(LEVEL)/Makefile.rules
-
-
-cleanup:
- rm -f Makefile *.d
-
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile Tue
Jun 7 16:29:46 2016
@@ -1,13 +1,8 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
-ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
-endif
-
include $(LEVEL)/Makefile.rules
-
cleanup:
rm -f Makefile *.d
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile Tue
Jun 7 16:29:46 2016
@@ -1,13 +1,3 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
-CXXFLAGS += -std=c++11
-ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
-endif
-
include $(LEVEL)/Makefile.rules
-
-
-cleanup:
- rm -f Makefile *.d
-
Modified:
lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
Tue Jun 7 16:29:46 2016
@@ -1,13 +1,6 @@
LEVEL = ../../../make
+
OBJC_SOURCES := main.m
LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
-ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
-endif
include $(LEVEL)/Makefile.rules
-
-
-cleanup:
- rm -f Makefile *.d
-
Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbinline.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbinline.py?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbinline.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbinline.py Tue Jun 7 16:29:46
2016
@@ -2,9 +2,7 @@ from __future__ import print_function
from __future__ import absolute_import
# System modules
-import filecmp
import os
-import sys
# Third-party modules
@@ -91,6 +89,9 @@ class InlineTest(TestBase):
return "-N dsym %s" % (self.mydir)
def BuildMakefile(self):
+ if os.path.exists("Makefile"):
+ return
+
categories = {}
for f in os.listdir(os.getcwd()):
@@ -101,7 +102,7 @@ class InlineTest(TestBase):
else:
categories[t] = [f]
- makefile = open("Makefile.tmp", 'w+')
+ makefile = open("Makefile", 'w+')
level = os.sep.join([".."] * len(self.mydir.split(os.sep))) + os.sep +
"make"
@@ -117,26 +118,11 @@ class InlineTest(TestBase):
if ('CXX_SOURCES' in list(categories.keys())):
makefile.write("CXXFLAGS += -std=c++11\n")
- # clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
- # targets. Other targets do not, which causes this test to fail.
- # This flag enables FullDebugInfo for all targets.
-
- makefile.write("ifneq (,$(findstring clang,$(CC)))\n")
- makefile.write(" CFLAGS_EXTRAS += -fno-limit-debug-info\n")
- makefile.write("endif\n\n")
-
- makefile.write("include $(LEVEL)/Makefile.rules\n\n")
-
+ makefile.write("include $(LEVEL)/Makefile.rules\n")
makefile.write("\ncleanup:\n\trm -f Makefile *.d\n\n")
makefile.flush()
makefile.close()
- if os.path.exists("Makefile"):
- if not filecmp.cmp("Makefile", "Makefile.tmp"):
- sys.exit("Existing Makefile doesn't match generated Makefile!")
-
- os.rename("Makefile.tmp", "Makefile")
-
@skipUnlessDarwin
def __test_with_dsym(self):
self.using_dsym = True
Modified:
lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile?rev=272062&r1=272061&r2=272062&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile
Tue Jun 7 16:29:46 2016
@@ -1,13 +1,4 @@
LEVEL = ../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
-ifneq (,$(findstring clang,$(CC)))
- CFLAGS_EXTRAS += -fno-limit-debug-info
-endif
-
include $(LEVEL)/Makefile.rules
-
-
-cleanup:
- rm -f Makefile *.d
-
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
