diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-01-18 11:44:03 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-01-18 13:25:55 +0000 |
| commit | 30e4967e8985ad6e0d2414c5e4a1dea1f1f9f8f4 (patch) | |
| tree | 9325ca81626f49627d4dfffc09b3f8bfd5c6f5c2 /tests | |
| parent | d38722eff3c7b07a452e5ce97b01c4f31bcedfcd (diff) | |
Fix glitches in !include directive
Includes like <"foo.mk"> were not possible.
Includes like "foo.mk" did not recursively search through parent
makefiles directories.
Change-Id: I20daccae52c5af83a98ec2b95522a4ac03a99ddd
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/makefiles/include_test.mk | 1 | ||||
| -rw-r--r-- | tests/makefiles/subdir/include8.mk | 3 | ||||
| -rw-r--r-- | tests/makefiles/subdir/include9.mk | 3 | ||||
| -rw-r--r-- | tests/makefiles/subdir/subsub/include6.mk | 1 | ||||
| -rw-r--r-- | tests/tests.cpp | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/tests/makefiles/include_test.mk b/tests/makefiles/include_test.mk index 0aa96fd..a45fb55 100644 --- a/tests/makefiles/include_test.mk +++ b/tests/makefiles/include_test.mk @@ -4,6 +4,7 @@ include include2.mk # old style include directive INCLUDE = $(INCLUDE);subdir ! include <include3.mk> !include "subdir\include4.mk" +!include <"include9.mk"> includeFoo: # this is not an include directive! diff --git a/tests/makefiles/subdir/include8.mk b/tests/makefiles/subdir/include8.mk new file mode 100644 index 0000000..cbcbd77 --- /dev/null +++ b/tests/makefiles/subdir/include8.mk @@ -0,0 +1,3 @@ +!message "include 8" +INCLUDE8 = TRUE + diff --git a/tests/makefiles/subdir/include9.mk b/tests/makefiles/subdir/include9.mk new file mode 100644 index 0000000..a4ace05 --- /dev/null +++ b/tests/makefiles/subdir/include9.mk @@ -0,0 +1,3 @@ +!message "include 9" +INCLUDE9 = TRUE + diff --git a/tests/makefiles/subdir/subsub/include6.mk b/tests/makefiles/subdir/subsub/include6.mk index 98a8bb2..4637fa5 100644 --- a/tests/makefiles/subdir/subsub/include6.mk +++ b/tests/makefiles/subdir/subsub/include6.mk @@ -1,3 +1,4 @@ !message "include 6" INCLUDE6=TRUE !include include7.mk +!include "include8.mk" diff --git a/tests/tests.cpp b/tests/tests.cpp index 4041eb0..f983e24 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -80,6 +80,8 @@ void Tests::includeFiles() QCOMPARE(macroTable.macroValue("INCLUDE5"), QLatin1String("TRUE")); QCOMPARE(macroTable.macroValue("INCLUDE6"), QLatin1String("TRUE")); QCOMPARE(macroTable.macroValue("INCLUDE7"), QLatin1String("TRUE")); + QCOMPARE(macroTable.macroValue("INCLUDE8"), QLatin1String("TRUE")); + QCOMPARE(macroTable.macroValue("INCLUDE9"), QLatin1String("TRUE")); } void Tests::includeCycle() |