diff options
| author | Jason Perkins <starkos@industriousone.com> | 2014-04-03 19:18:11 +0400 |
|---|---|---|
| committer | Jason Perkins <starkos@industriousone.com> | 2014-04-03 19:18:11 +0400 |
| commit | 80adf90f70ae04e75216b014cc0f8983bb24de0b (patch) | |
| tree | c024317b7b4ee11cabd997ff5fb8a50d6c19a1d7 /tests | |
| parent | a411a4265650779087894d662a84c028c3ca1035 (diff) | |
| parent | 6871e492b12a29a027287398f544d5503ae6922d (diff) | |
Merged in dcourtois/premake-stable/test_vs_macros (pull request #43)
added a test to ensure VS macros are correctly handled in include paths.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/actions/vstudio/test_vs2010_vcxproj.lua | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/actions/vstudio/test_vs2010_vcxproj.lua b/tests/actions/vstudio/test_vs2010_vcxproj.lua index c5b3401..c11ec9e 100644 --- a/tests/actions/vstudio/test_vs2010_vcxproj.lua +++ b/tests/actions/vstudio/test_vs2010_vcxproj.lua @@ -2,6 +2,7 @@ local vs10_vcxproj = T.vs2010_vcxproj local include_directory = "bar/foo" local include_directory2 = "baz/foo" + local include_directory_vs_macros = "$(Macro1)/foo/bar/$(Macro2)/baz" local debug_define = "I_AM_ALIVE_NUMBER_FIVE" local vc2010 = premake.vstudio.vc2010 @@ -25,7 +26,8 @@ includedirs { include_directory, - include_directory2 + include_directory2, + include_directory_vs_macros } files { @@ -168,6 +170,13 @@ test.string_contains(buffer,cl_compile_string('Debug').. '.*<AdditionalIncludeDirectories>.*'.. path.translate(include_directory2, '\\') ..';.*</AdditionalIncludeDirectories>') end + function vs10_vcxproj.includeDirectories_debugEntryContains_include_directory_vs_macros() + local buffer = get_buffer() + -- visual studio macros use $ as a prefix, which is a special regex character, so we need to replace them. + local search_string = string.gsub(include_directory_vs_macros, "%$", "%$%") + test.string_contains(buffer,cl_compile_string('Debug').. '.*<AdditionalIncludeDirectories>.*'.. path.translate(search_string, '\\') ..'.*</AdditionalIncludeDirectories>') + end + function vs10_vcxproj.debugContainsPreprossorBlock() local buffer = get_buffer() test.string_contains(buffer,cl_compile_string('Debug').. '.*<PreprocessorDefinitions>.*</PreprocessorDefinitions>') |