summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ExternalData-multiple-hashes'Brad King2016-10-195-0/+6
|\ | | | | | | | | 33a9aaa8 ExternalData: Add support for multiple hash algorithms
| * ExternalData: Add support for multiple hash algorithmsMatt McCormick2016-10-185-0/+6
| | | | | | | | | | | | | | | | | | | | Add support for projects to have `Data.txt.md5` *and* `Data.txt.sha512` where the content links hold hashes for the same file. Check all `ExternalData_URL_TEMPLATES` entries in order for all available hashes. The data acquisition is considered a failure if none of the available URL resources has any of the given hashes. This makes it possible to have multiple data server resources where all servers do not support all hashing algorithms.
* | Merge topic 'fix-Android-NsightTegra'Brad King2016-10-192-1/+4
|\ \ | |/ |/| | | | | | | | | 9af881d8 Tests: Add VSNsightTegra test for VS 2015 6739d240 Tests: Fix VSNsightTegra test on Android NDK r12b 06c39612 VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support
| * Tests: Add VSNsightTegra test for VS 2015Brad King2016-10-181-0/+3
| |
| * Tests: Fix VSNsightTegra test on Android NDK r12bBrad King2016-10-181-1/+1
| | | | | | | | | | Test with architecture `armv7-a` instead of `armv7-a-hard` because the latter is supporte supported only with NDK revisions r9c to r11c.
| * Merge branch 'android-export-has-cpp' into releaseBrad King2016-10-074-1/+10
| |\
* | \ Merge topic 'propagate_ctest_use_launchers'Brad King2016-10-183-0/+7
|\ \ \ | | | | | | | | | | | | | | | | 19beee46 ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to project
| * | | ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to projectBill Hoffman2016-10-173-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `CTEST_USE_LAUNCHERS` is `TRUE` in a CTest script then the `ctest_configure` command will add `-DCTEST_USE_LAUNCHERS:BOOL=TRUE` to the cmake command used to configure the project. This allows a project to only set `CTEST_USE_LAUNCHERS` in a ctest script and have launchers work.
* | | | Merge topic 'math-EXPR-unary'Brad King2016-10-181-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2810e561 math(EXPR): Add support for unary `+` and `-` expressions 834f52a6 cmExprParser: Revise indentation style to match rest of CMake 7aaed265 cmExprParser: Port to bison 3
| * | | | math(EXPR): Add support for unary `+` and `-` expressionsBrad King2016-10-141-0/+3
| | | | | | | | | | | | | | | | | | | | Closes: #8996
* | | | | cmTarget: Move sanity checks and computed property access to callersStephen Kelly2016-10-161-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GetProperty method is now just accessing contained data, meaning it can be implemented in cmState. Remove the cmMakefile context from the signature as a result and remove the overload with the same signature. Add a GetComputedProperty to cmTarget so that templates can be properly instantiated. Otherwise the Commands would need to be able to reach the specializations which are currently in cmTarget.cxx. As a side-effect, the CMP0026 warning now gives a backtrace to the target when issued from a generator expression.
* | | | Merge topic 'vs-host-x64-tools'Brad King2016-10-1410-0/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | d079e71c VS: Provide an option to use x64 host tools 779939a0 Help: Document VS and Xcode toolset selection
| * | | | VS: Provide an option to use x64 host toolsBrad King2016-10-1410-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio provides toolchains that are themselves built for 32-bit or 64-bit host architectures. By default it uses the 32-bit tools, but it can be told to prefer the 64-bit tools on 64-bit hosts. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a way to request use of the 64-bit host tools. Closes: #15622
* | | | | Merge topic 'ninja-framework-POST_BUILD'Brad King2016-10-141-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 20278872 Ninja: Fix POST_BUILD commands on macOS Frameworks
| * | | | | Ninja: Fix POST_BUILD commands on macOS FrameworksBrad King2016-10-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The condition added by commit v2.8.12~179^2 (OS X: Fix regression handling frameworks for Ninja, 2013-07-16) for excluding use of versioning symlinks on macOS Frameworks must match that used for POST_BUILD selection. Otherwise we place the POST_BUILD commands after a symlink step that is never added. Closes: #16363
* | | | | | Merge topic 'ExternalProject-fix-CMAKE_CACHE_ARGS-list'Brad King2016-10-134-2/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c98cb3 ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGS
| * | | | | | ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGSMax Smolens2016-10-104-2/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix passing a list to the CMAKE_CACHE_ARGS and CMAKE_CACHE_DEFAULT_ARGS options of ExternalProject_Add. Following commit v3.7.0-rc1~273^2~1 (prefer list(APPEND) over string(APPEND) where appropriate, 2016-08-08), the semicolon list separator after the first list element was missing in the generated cache.
* | | | | | Merge topic 'minor-cleanups'Brad King2016-10-101-10/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c637e0c5 cmMakefile: Return a string from GetDefineFlags fbc1b75c Test: Remove condition for CMake version no longer supported 3d0e95f6 cmLocalGenerator: Extract definition retrieval out of loop 2a49d86d Makefiles: Inline only use of method b0301db2 Makefiles: Make helper class independent of cmLocalGenerator 267e0209 cmMakefile: Remove pointless condition 009019f2 Makefiles: Extract identical code from condition 378849f4 Makefiles: Replace array access with local variable 4a3c49b4 Makefiles: Separate two coupled calls
| * | | | | | Test: Remove condition for CMake version no longer supportedStephen Kelly2016-10-101-10/+3
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'test-cpack-improve-failure-messages'Brad King2016-10-101-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f90d5e5 Tests: Improve RunCMake.CPack_* failure message formatting
| * | | | | | Tests: Improve RunCMake.CPack_* failure message formattingBrad King2016-10-071-2/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format a `message(FATAL_ERROR)` call with markup to make the generated message more readable so that the difference between the actual and expected results is easier to see.
* | | | | | Merge topic 'android-export-has-cpp'Brad King2016-10-104-1/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | dda6775c Android: Record use of C++ by static libs in exported Android.mk files
| * | | | | Android: Record use of C++ by static libs in exported Android.mk filesBrad King2016-10-074-1/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `PREBUILT_STATIC_LIBRARY` uses C++ in its sources then the `.a` file will have a link-time dependency on the C++ runtime libraries. Android NDK r14 will add a way to give this information to the NDK build system by adding a `LOCAL_HAS_CPP` setting to the `Android.mk` file. Add this for exported static libraries that use C++.
* | | | | Merge topic 'android-cxxabi'Brad King2016-10-102-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | 8cdac469 Android: Fix support for cxxabi.h with libc++
| * | | Android: Fix support for cxxabi.h with libc++Brad King2016-10-072-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Additional include directories are needed for this on some STL types. Closes: #16350
* | | | CPack/RPM single debuginfo packagingDomen Vrankar2016-10-0710-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate a single debuginfo package even if components packaging is enabled. This makes issue #15668 resolution feature complete. Closes: #15486
* | | | CPack/RPM learned defining main componentDomen Vrankar2016-10-075-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Main component rpm package is generated without component suffix in filename and package name.
* | | | Merge topic 'android-ndk-r13'Brad King2016-10-071-2/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | 0c3a0477 Android: Update libc++ include directories for NDK r13 ebef3632 Android: Suppress -Wattributes warnings in test case builds
| * | Android: Suppress -Wattributes warnings in test case buildsBrad King2016-10-061-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | We use `-Werror` in the Android test builds to make sure there are no warnings that we care about (e.g. unused flags). However, the NDK r13 tools produce a warning about their own builtins: ``` <built-in>: In function 'float abs(float)': <built-in>: warning: conflicts with previous declaration here [-Wattributes] ``` Suppress this warning so that we can continue using `-Werror` but tolerate these warnings.
* | Add a BUILD_RPATH target property specifying build-tree RPATH entriesRuslan Baratov2016-10-031-3/+12
|/ | | | | | Users may need to add custom `RPATH` entries to be able to run binaries from their build tree without setting `LD_LIBRARY_PATH`. Provide a way to do this that does not affect the install-tree `RPATH`.
* Merge topic 'autogen-empty-qrc'Brad King2016-10-013-0/+19
|\ | | | | | | | | | | bcafc399 QtAutogen: Add test for empty qrc file 98b11f25 QtAutogen: Allow .qrc files that do not contain any file reference
| * QtAutogen: Add test for empty qrc fileSebastian Holtermann2016-09-303-0/+19
| |
* | Merge topic 'add-setup-projects-tests-module'Brad King2016-10-0116-0/+148
|\ \ | | | | | | | | | | | | 130784e0 AndroidTestUtilities: Add module to help drive Android device tests
| * | AndroidTestUtilities: Add module to help drive Android device testsSchuyler Kylstra2016-09-3016-0/+148
| | | | | | | | | | | | | | | | | | Add a module to manage the data needed for the project tests. It will move the test data to the build directory and transfer necessary data to an Android device if that is enabled.
* | | Tests: Teach Server test to wait for server exitBrad King2016-09-301-0/+14
| |/ |/| | | | | | | | | | | We expect the server to exit when its communication pipes are closed. Close them and wait for the server to exit. If supported by the current version of python, kill the server if it does not exit after a few seconds.
* | server-mode: Add option to enable/disable test case explicitlyBrad King2016-09-291-1/+1
| | | | | | | | | | | | | | Add a `CMake_TEST_SERVER_MODE` option that can be set in testing builds to enable/disable server mode tests explicitly. This will allow testing in combination with `CMake_TEST_EXTERNAL_CMAKE` or for server mode to be built on systems that have a python version that cannot run the test.
* | server-mode: Rename variable CMake_{HAVE => ENABLE}_SERVER_MODEBrad King2016-09-291-1/+1
| | | | | | | | The latter is a better name for making it a public-facing option.
* | Merge topic 'cmake_parse_arguments-PARSE_ARGV-multi-value'Brad King2016-09-295-19/+92
|\ \ | | | | | | | | | | | | | | | 66c70cd9 cmake_parse_arguments: Add additional unit tests 41291b20 cmake_parse_arguments: Fix PARSE_ARGV multi-value argument handling
| * | cmake_parse_arguments: Add additional unit testsMatthew Woehlke2016-09-285-29/+84
| | | | | | | | | | | | Add additional unit tests for some corner cases in argument splitting.
| * | cmake_parse_arguments: Fix PARSE_ARGV multi-value argument handlingMatthew Woehlke2016-09-281-2/+20
| |/ | | | | | | | | | | | | | | | | The `PARSE_ARGV` mode was recently added to help functions properly parse their arguments even when those arguments may be quoted and contain literal `;` in their values. Fix the implementation to encode `;`s in reported multi-value arguments and in `UNPARSED_ARGUMENTS` so that `;`s in the individual values are preserved in the lists. This allows clients to access all their argument values correctly.
* | Merge topic 'cmake-server-commands'Brad King2016-09-299-20/+108
|\ \ | | | | | | | | | | | | | | | | | | | | | 71a50587 server-mode: Add project data for unit tests 7b1e60f2 server-mode: Report CMakeCache entries 84553a6e server-mode: Add command to retrieve build system files ead71873 server-mode: Report information relevant for a codemodel
| * | server-mode: Add project data for unit testsTobias Hunger2016-09-289-20/+108
| |/ | | | | | | | | | | | | | | | | Do some basic unit tests for "codemodel", "cmakeInputs" and "cache" commands of the cmake server. This just calls the commands right now and makes sure the server thinks it can reply to the request. The data itself is currently not validated.
* | Merge topic 'fix-explicit-RC'Brad King2016-09-294-12/+17
|\ \ | | | | | | | | | | | | | | | 9c5238df project: Fix support for explicit RC language 40c04821 Tests: Decide earlier whether to test resources
| * | project: Fix support for explicit RC languageBrad King2016-09-283-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check added in commit v3.6.0-rc1~293^2 (Diagnose recursive project/enable_language without crashing, 2016-03-07) broke support for enabling `RC` explicitly along with other languages like `C`. The reason is that we enable all listed languages at once so the internal `enable_language(RC)` that we do while enabling `C` or `CXX` on some platforms triggers the recursion check if `RC` is explicitly listed. Ideally we should refactor things to only enable one language at a time, but for now it is simplest to just exclude `RC` from the explicit list until other languages are enabled, and then enable it. Closes: #16330
| * | Tests: Decide earlier whether to test resourcesBrad King2016-09-281-11/+12
| |/ | | | | | | Provide a CMake_TEST_RESOURCES variable storing the decision.
* | Tests: Add newline to RunCMake.CPack_RPM SOURCE_PACKAGE caseBrad King2016-09-281-1/+1
|/ | | | | | The `main.cpp` that this test generates needs a newline so that compilers do not warn about a missing newline. Otherwise the warning causes RunCMake infrastructure to detect unexpected output.
* Tests: Update ModuleNotices test for new noticeBrad King2016-09-271-18/+5
|
* Simplify CMake per-source license noticesBrad King2016-09-2721-260/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | Per-source copyright/license notice headers that spell out copyright holder names and years are hard to maintain and often out-of-date or plain wrong. Precise contributor information is already maintained automatically by the version control tool. Ultimately it is the receiver of a file who is responsible for determining its licensing status, and per-source notices are merely a convenience. Therefore it is simpler and more accurate for each source to have a generic notice of the license name and references to more detailed information on copyright holders and full license terms. Our `Copyright.txt` file now contains a list of Contributors whose names appeared source-level copyright notices. It also references version control history for more precise information. Therefore we no longer need to spell out the list of Contributors in each source file notice. Replace CMake per-source copyright/license notice headers with a short description of the license and links to `Copyright.txt` and online information available from "https://cmake.org/licensing". The online URL also handles cases of modules being copied out of our source into other projects, so we can drop our notices about replacing links with full license text. Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority of the replacements mechanically. Manually fix up shebang lines and trailing newlines in a few files. Manually update the notices in a few files that the script does not handle.
* Tests: Fix RunCMake.CTest output match to tolerate line number changesBrad King2016-09-271-3/+3
|
* Merge topic 'cpack-rpm-debuginfo-sources'Brad King2016-09-272-2/+10
|\ | | | | | | | | | | | | 39c7d62c CPack/RPM debuginfo packaging documentation dd3c938a CPack/RPM debuginfo directories to sources b78fcf0d CPack/RPM debuginfo packages must contain sources