From 3c324689a7a3e16b7f232b943efd4ded971467bf Mon Sep 17 00:00:00 2001 From: Asit Dhal Date: Wed, 21 Oct 2020 11:20:37 +0200 Subject: include: refactor call sites of cmMakefile::ReadDependentFile Fixes: #16773 --- Tests/RunCMake/include/ExportExportInclude-stderr.txt | 2 +- Tests/RunCMake/include/IncludeIsDirectory-result.txt | 1 + Tests/RunCMake/include/IncludeIsDirectory-stderr.txt | 6 ++++++ Tests/RunCMake/include/IncludeIsDirectory.cmake | 1 + Tests/RunCMake/include/IncludeMalformed-result.txt | 1 + Tests/RunCMake/include/IncludeMalformed-stderr.txt | 13 +++++++++++++ Tests/RunCMake/include/IncludeMalformed.cmake | 1 + Tests/RunCMake/include/RunCMakeTest.cmake | 2 ++ Tests/RunCMake/include/malformedInclude.cmake | 1 + 9 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Tests/RunCMake/include/IncludeIsDirectory-result.txt create mode 100644 Tests/RunCMake/include/IncludeIsDirectory-stderr.txt create mode 100644 Tests/RunCMake/include/IncludeIsDirectory.cmake create mode 100644 Tests/RunCMake/include/IncludeMalformed-result.txt create mode 100644 Tests/RunCMake/include/IncludeMalformed-stderr.txt create mode 100644 Tests/RunCMake/include/IncludeMalformed.cmake create mode 100644 Tests/RunCMake/include/malformedInclude.cmake (limited to 'Tests/RunCMake/include') diff --git a/Tests/RunCMake/include/ExportExportInclude-stderr.txt b/Tests/RunCMake/include/ExportExportInclude-stderr.txt index 70d013cfd6..6d5c02f196 100644 --- a/Tests/RunCMake/include/ExportExportInclude-stderr.txt +++ b/Tests/RunCMake/include/ExportExportInclude-stderr.txt @@ -1,5 +1,5 @@ CMake Error at ExportExportInclude.cmake:6 \(include\): - include could not find load file: + include could not find requested file: .*/Tests/RunCMake/include/ExportExportInclude-build/theTargets.cmake Call Stack \(most recent call first\): diff --git a/Tests/RunCMake/include/IncludeIsDirectory-result.txt b/Tests/RunCMake/include/IncludeIsDirectory-result.txt new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/Tests/RunCMake/include/IncludeIsDirectory-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/include/IncludeIsDirectory-stderr.txt b/Tests/RunCMake/include/IncludeIsDirectory-stderr.txt new file mode 100644 index 0000000000..5735c29136 --- /dev/null +++ b/Tests/RunCMake/include/IncludeIsDirectory-stderr.txt @@ -0,0 +1,6 @@ +CMake Error at IncludeIsDirectory.cmake:1 \(include\): + include requested file is a directory: + + .*/Tests/RunCMake/include/IncludeIsDirectory-build +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/include/IncludeIsDirectory.cmake b/Tests/RunCMake/include/IncludeIsDirectory.cmake new file mode 100644 index 0000000000..74189e33de --- /dev/null +++ b/Tests/RunCMake/include/IncludeIsDirectory.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_BINARY_DIR}") diff --git a/Tests/RunCMake/include/IncludeMalformed-result.txt b/Tests/RunCMake/include/IncludeMalformed-result.txt new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/Tests/RunCMake/include/IncludeMalformed-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/include/IncludeMalformed-stderr.txt b/Tests/RunCMake/include/IncludeMalformed-stderr.txt new file mode 100644 index 0000000000..fc755495cf --- /dev/null +++ b/Tests/RunCMake/include/IncludeMalformed-stderr.txt @@ -0,0 +1,13 @@ +CMake Error at malformedInclude.cmake:1: + Parse error. Function missing ending "\)". End of file reached. +Call Stack \(most recent call first\): + IncludeMalformed.cmake:1 \(include\) + CMakeLists.txt:3 \(include\) + + +CMake Error at IncludeMalformed.cmake:1 \(include\): + include could not load requested file: + + malformedInclude.cmake +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/include/IncludeMalformed.cmake b/Tests/RunCMake/include/IncludeMalformed.cmake new file mode 100644 index 0000000000..956014281e --- /dev/null +++ b/Tests/RunCMake/include/IncludeMalformed.cmake @@ -0,0 +1 @@ +include("malformedInclude.cmake") diff --git a/Tests/RunCMake/include/RunCMakeTest.cmake b/Tests/RunCMake/include/RunCMakeTest.cmake index bea7d5cc48..8fb7201384 100644 --- a/Tests/RunCMake/include/RunCMakeTest.cmake +++ b/Tests/RunCMake/include/RunCMakeTest.cmake @@ -5,3 +5,5 @@ run_cmake(EmptyStringOptional) run_cmake(CMP0024-WARN) run_cmake(CMP0024-NEW) run_cmake(ExportExportInclude) +run_cmake(IncludeIsDirectory) +run_cmake(IncludeMalformed) diff --git a/Tests/RunCMake/include/malformedInclude.cmake b/Tests/RunCMake/include/malformedInclude.cmake new file mode 100644 index 0000000000..3cec3ad966 --- /dev/null +++ b/Tests/RunCMake/include/malformedInclude.cmake @@ -0,0 +1 @@ +if( -- cgit v1.2.1