diff options
| author | Brad King <brad.king@kitware.com> | 2007-06-06 20:20:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-06-06 20:20:02 (GMT) |
| commit | db0f26e85264b47dabaa1d400ad2fec1eb848eac (patch) | |
| tree | 9a1077fe904c820fa6ec3a4bb7af33a18ce03714 /Tests/StringFileTest | |
| parent | d016b69af3304965f4ce7fd1953e9901def528a4 (diff) | |
| download | CMake-db0f26e85264b47dabaa1d400ad2fec1eb848eac.zip CMake-db0f26e85264b47dabaa1d400ad2fec1eb848eac.tar.gz CMake-db0f26e85264b47dabaa1d400ad2fec1eb848eac.tar.bz2 | |
BUG: Fixed @ONLY configuration to not try to parse ${} syntax at all. This fixes the original fix to bug#4393 and adds a test.
Diffstat (limited to 'Tests/StringFileTest')
| -rw-r--r-- | Tests/StringFileTest/InputFile.h.in | 4 | ||||
| -rw-r--r-- | Tests/StringFileTest/StringFile.cxx | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Tests/StringFileTest/InputFile.h.in b/Tests/StringFileTest/InputFile.h.in index c7c1995..3e70a36 100644 --- a/Tests/StringFileTest/InputFile.h.in +++ b/Tests/StringFileTest/InputFile.h.in @@ -5,6 +5,10 @@ /* This should be configured to a commented undef with the curlies in place */ #cmakedefine TEST_NOT_DEFINED ${TEST_NOT_DEFINED} +/* This complicated line should be configured unchanged: */ +static const char* configvar = +"@$@$junk =~ s/#$xyz#/$foo_bar{$wibble}->{$xyz}/;@@"; + int CheckMethod(const char* var, const char* val ) { if ( !var ) diff --git a/Tests/StringFileTest/StringFile.cxx b/Tests/StringFileTest/StringFile.cxx index 0601aa0..609ebaf 100644 --- a/Tests/StringFileTest/StringFile.cxx +++ b/Tests/StringFileTest/StringFile.cxx @@ -24,6 +24,8 @@ int main(int, char*[]) res += CheckMethod(tuvar, "CMAKE"); res += CheckMethod(tlvar, "cmake"); res += CheckMethod(relpath, "../../X11R6/bin/xnest"); + res += CheckMethod(configvar, + "@$@$junk =~ s/#$xyz#/$foo_bar{$wibble}->{$xyz}/;@@"); return res; } |