From 82948805ecbd5d65db27c646b594f4ce331a8f97 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 8 Apr 2019 09:49:29 -0400 Subject: [PATCH] Tests: Clarify hand-written cases in RunCMake.ParseImplicitIncludeInfo --- .../ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake | 4 ++-- .../data/{empty-C.input => hand-C-empty.input} | 0 .../data/{empty-C.output => hand-C-empty.output} | 0 .../data/{empty-CXX.input => hand-CXX-empty.input} | 0 .../data/{empty-CXX.output => hand-CXX-empty.output} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename Tests/RunCMake/ParseImplicitIncludeInfo/data/{empty-C.input => hand-C-empty.input} (100%) rename Tests/RunCMake/ParseImplicitIncludeInfo/data/{empty-C.output => hand-C-empty.output} (100%) rename Tests/RunCMake/ParseImplicitIncludeInfo/data/{empty-CXX.input => hand-CXX-empty.input} (100%) rename Tests/RunCMake/ParseImplicitIncludeInfo/data/{empty-CXX.output => hand-CXX-empty.output} (100%) diff --git a/Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake b/Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake index a39a529840..41a407f319 100644 --- a/Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake +++ b/Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake @@ -17,8 +17,8 @@ set(targets darwin-C-AppleClang-8.0.0.8000042 darwin-CXX-AppleClang-8.0.0.8000042 darwin_nostdinc-C-AppleClang-8.0.0.8000042 darwin_nostdinc-CXX-AppleClang-8.0.0.8000042 - empty-C empty-CXX freebsd-C-Clang-3.3.0 freebsd-CXX-Clang-3.3.0 freebsd-Fortran-GNU-4.6.4 + hand-C-empty hand-CXX-empty linux-C-GNU-7.3.0 linux-CXX-GNU-7.3.0 linux-Fortran-GNU-7.3.0 linux-C-Intel-18.0.0.20170811 linux-CXX-Intel-18.0.0.20170811 linux-C-PGI-18.10.1 linux-CXX-PGI-18.10.1 @@ -104,7 +104,7 @@ foreach(t ${targets}) file(READ ${outfile} output) string(STRIP "${output}" output) cmake_parse_implicit_include_info("${input}" "${lang}" idirs log state) - if(t MATCHES "^empty-") # empty isn't supposed to parse + if(t MATCHES "-empty$") # empty isn't supposed to parse if("${state}" STREQUAL "done") message("empty parse failed: ${idirs}, log=${log}") endif() diff --git a/Tests/RunCMake/ParseImplicitIncludeInfo/data/empty-C.input b/Tests/RunCMake/ParseImplicitIncludeInfo/data/hand-C-empty.input similarity index 100% rename from Tests/RunCMake/ParseImplicitIncludeInfo/data/empty-C.input rename to Tests/RunCMake/ParseImplicitIncludeInfo/data/hand-C-empty.input diff --git a/Tests/RunCMake/ParseImplicitIncludeInfo/data/empty-C.output b/Tests/RunCMake/ParseImplicitIncludeInfo/data/hand-C-empty.output similarity index 100% rename from Tests/RunCMake/ParseImplicitIncludeInfo/data/empty-C.output rename to Tests/RunCMake/ParseImplicitIncludeInfo/data/hand-C-empty.output diff --git a/Tests/RunCMake/ParseImplicitIncludeInfo/data/empty-CXX.input b/Tests/RunCMake/ParseImplicitIncludeInfo/data/hand-CXX-empty.input similarity index 100% rename from Tests/RunCMake/ParseImplicitIncludeInfo/data/empty-CXX.input rename to Tests/RunCMake/ParseImplicitIncludeInfo/data/hand-CXX-empty.input diff --git a/Tests/RunCMake/ParseImplicitIncludeInfo/data/empty-CXX.output b/Tests/RunCMake/ParseImplicitIncludeInfo/data/hand-CXX-empty.output similarity index 100% rename from Tests/RunCMake/ParseImplicitIncludeInfo/data/empty-CXX.output rename to Tests/RunCMake/ParseImplicitIncludeInfo/data/hand-CXX-empty.output