[Lldb-commits] [lldb] 0d236d8 - [lldb] Update hardcoded Makefile.rules inclusions.

[Jordan Rupprecht via lldb-commits]

Author: Jordan Rupprecht
Date: 2019-12-05T15:50:03-08:00
New Revision: 0d236d8b4f8aecc258e26ad53755a39d9b76032e

URL: https://github.com/llvm/llvm-project/commit/0d236d8b4f8aecc258e26ad53755a39d9b76032e
DIFF: https://github.com/llvm/llvm-project/commit/0d236d8b4f8aecc258e26ad53755a39d9b76032e.diff

LOG: [lldb] Update hardcoded Makefile.rules inclusions.

This replaces `include $(LEVEL)/Makefile.rules` with `include Makefile.rules`.
The lldb test driver already passes the include path when running make, and specifically looking for "../../Makefile.rules" forces the test to be in a specific location.
Removing this hardcoded relative path will make it possible to move this test as-is.

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile
    lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile
    lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile
    lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile
index f5a47fcc46cc..c9319d6e6888 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/float-display/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../make
 C_SOURCES := main.c
-include $(LEVEL)/Makefile.rules
+include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile
index a49ffa84c547..db8fa57abb91 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/param_entry_vals/basic_entry_values_x86_64/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../../make
 CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
 CXXFLAGS_EXTRAS := -O2 -glldb -Xclang -femit-debug-entry-values
 include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile
index 99bfa7e03b47..3d0b98f13f3d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/thread_local/Makefile
@@ -1,3 +1,2 @@
-LEVEL = ../../../make
 CXX_SOURCES := main.cpp
-include $(LEVEL)/Makefile.rules
+include Makefile.rules

diff  --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile
index 61e3337e1d9e..2123af1dd701 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile
@@ -1,5 +1,3 @@
-LEVEL = ../../make
-
 C_SOURCES := main.c
 LD_EXTRAS := -L. -lfoo
 
@@ -12,4 +10,4 @@ libfoo.dylib: foo.c
 	$(MAKE) -f $(MAKEFILE_RULES) \
 		DYLIB_ONLY=YES DYLIB_NAME=foo DYLIB_C_SOURCES=foo.c
 
-include $(LEVEL)/Makefile.rules
+include Makefile.rules