vulkan: Changes to 'debian-unstable'
.gitignore | 2
BUILD.md | 338
CMakeLists.txt | 43
CONTRIBUTING.md | 90
LunarGLASS_revision | 1
LunarGLASS_revision_R32 | 1
README.md | 34
buildAndroid/android-generate.bat | 33
buildAndroid/android-generate.sh | 8
buildAndroid/jni/Android.mk | 277
buildAndroid/jni/Application.mk | 6
debian/changelog | 9
debian/control | 2
debian/patches/demos-add-install-rule.diff | 7
debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff | 40
debian/patches/demos-dont-build-tri-or-cube.diff | 39
debian/patches/layers-install-to-cmake-install-libdir.diff | 6
debian/patches/layers-use-local-spirv-hpp.diff | 2
debian/patches/loader-add-install-rule.diff | 6
debian/patches/series | 2
debian/patches/trim-build.diff | 2
demos/CMakeLists.txt | 9
demos/cube.c | 66
demos/smoke/CMakeLists.txt | 78
demos/smoke/Game.h | 133
demos/smoke/Helpers.h | 131
demos/smoke/Main.cpp | 90
demos/smoke/Meshes.cpp | 537
demos/smoke/Meshes.h | 67
demos/smoke/Meshes.teapot.h | 2666 +++
demos/smoke/README.md | 1
demos/smoke/Shell.cpp | 591
demos/smoke/Shell.h | 162
demos/smoke/ShellAndroid.cpp | 227
demos/smoke/ShellAndroid.h | 68
demos/smoke/ShellWin32.cpp | 256
demos/smoke/ShellWin32.h | 63
demos/smoke/ShellXcb.cpp | 344
demos/smoke/ShellXcb.h | 62
demos/smoke/Simulation.cpp | 327
demos/smoke/Simulation.h | 112
demos/smoke/Smoke.cpp | 915 +
demos/smoke/Smoke.frag | 12
demos/smoke/Smoke.h | 195
demos/smoke/Smoke.push_constant.vert | 27
demos/smoke/Smoke.vert | 27
demos/smoke/android/build-and-install | 30
demos/smoke/android/build.gradle | 87
demos/smoke/android/gradle/wrapper/gradle-wrapper.jar |binary
demos/smoke/android/gradle/wrapper/gradle-wrapper.properties | 6
demos/smoke/android/gradlew | 160
demos/smoke/android/gradlew.bat | 90
demos/smoke/android/src/main/AndroidManifest.xml | 20
demos/smoke/android/src/main/jni/Smoke.frag.h | 78
demos/smoke/android/src/main/jni/Smoke.push_constant.vert.h | 352
demos/smoke/android/src/main/jni/Smoke.vert.h | 354
demos/smoke/android/src/main/res/values/strings.xml | 4
demos/smoke/generate-dispatch-table | 498
demos/smoke/glsl-to-spirv | 100
demos/tri.c | 232
demos/vulkaninfo.c | 100
generator.py | 3254 ++++
genvk.py | 337
glslang_revision | 2
include/vulkan/vk_debug_marker_layer.h | 44
include/vulkan/vk_icd.h | 13
include/vulkan/vk_layer.h | 15
include/vulkan/vk_lunarg_debug_marker.h | 98
include/vulkan/vk_platform.h | 2
include/vulkan/vulkan.h | 34
layers/.clang-format | 6
layers/CMakeLists.txt | 32
layers/README.md | 18
layers/device_limits.cpp | 884 -
layers/device_limits.h | 48
layers/draw_state.cpp | 8236 +++++------
layers/draw_state.h | 573
layers/image.cpp | 1356 -
layers/image.h | 55
layers/linux/VkLayer_device_limits.json | 4
layers/linux/VkLayer_draw_state.json | 11
layers/linux/VkLayer_image.json | 4
layers/linux/VkLayer_mem_tracker.json | 4
layers/linux/VkLayer_object_tracker.json | 4
layers/linux/VkLayer_param_checker.json | 4
layers/linux/VkLayer_swapchain.json | 4
layers/linux/VkLayer_threading.json | 8
layers/linux/VkLayer_unique_objects.json | 2
layers/mem_tracker.cpp | 2633 +--
layers/mem_tracker.h | 94
layers/object_tracker.h | 867 -
layers/param_check.h | 1743 --
layers/param_checker.cpp | 5291 ++-----
layers/param_checker_utils.h | 179
layers/swapchain.cpp | 4691 ++----
layers/swapchain.h | 262
layers/threading.cpp | 375
layers/threading.h | 310
layers/unique_objects.h | 654
layers/vk_layer_config.cpp | 22
layers/vk_layer_config.h | 3
layers/vk_layer_data.h | 4
layers/vk_layer_debug_marker_table.cpp | 72
layers/vk_layer_debug_marker_table.h | 49
layers/vk_layer_extension_utils.cpp | 15
layers/vk_layer_extension_utils.h | 9
layers/vk_layer_logging.h | 148
layers/vk_layer_settings.txt | 129
layers/vk_layer_table.cpp | 121
layers/vk_layer_table.h | 30
layers/vk_layer_utils.cpp | 427
layers/vk_layer_utils.h | 124
layers/vk_validation_layer_details.md | 124
layers/windows/VkLayer_device_limits.json | 4
layers/windows/VkLayer_draw_state.json | 11
layers/windows/VkLayer_image.json | 4
layers/windows/VkLayer_mem_tracker.json | 4
layers/windows/VkLayer_object_tracker.json | 4
layers/windows/VkLayer_param_checker.json | 4
layers/windows/VkLayer_swapchain.json | 4
layers/windows/VkLayer_threading.json | 8
layers/windows/VkLayer_unique_objects.json | 2
loader/CMakeLists.txt | 29
loader/LoaderAndLayerInterface.md | 348
loader/cJSON.c | 3
loader/debug_report.c | 18
loader/debug_report.h | 16
loader/loader.c | 1236 -
loader/loader.h | 239
loader/table_ops.h | 44
loader/trampoline.c | 529
loader/vk-loader-generate.py | 19
loader/vk_loader_platform.h | 9
loader/wsi.c | 551
loader/wsi.h | 121
reg.py | 762 +
spirv-tools_revision | 2
tests/layer_validation_tests.cpp | 421
tests/test_environment.cpp | 2
tests/vk_layer_settings.txt | 32
tests/vkrenderframework.cpp | 128
tests/vkrenderframework.h | 10
tests/vktestframeworkandroid.cpp | 1
update_external_sources.bat | 361
update_external_sources.sh | 80
vk-generate.py | 15
vk-layer-generate.py | 275
vk.xml | 5037 ++++++
vk_helper.py | 268
vk_layer_documentation_generate.py | 3
vulkan.py | 133
151 files changed, 33319 insertions(+), 21071 deletions(-)
New commits:
commit e8d0d61c0854da940955098fd7abaa33be7d67f6
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Mar 15 15:45:36 2016 +0200
control: Add libx11-dev and python3-lxml to build-depends.
diff --git a/debian/changelog b/debian/changelog
index 42959be..54dfb94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ vulkan (1.0.5.0+dfsg1-1) UNRELEASED; urgency=medium
* New upstream release.
* patches: Refreshed.
* Don't build smoke demo, needs glslang like tri/cube.
+ * control: Add libx11-dev and python3-lxml to build-depends.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 15 Mar 2016 15:27:12 +0200
diff --git a/debian/control b/debian/control
index a695565..7231448 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,11 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Timo Aaltonen <tjaalton@debian.org>
Build-Depends: debhelper (>= 9),
cmake,
+ libx11-dev,
libxcb1-dev,
pkg-config,
python3,
+ python3-lxml,
quilt,
Standards-Version: 3.9.6
Section: libs
commit c4548c3b966da99542e0e8feb4836d3fab4d2b65
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Mar 15 15:45:18 2016 +0200
Don't build smoke demo, needs glslang like tri/cube.
diff --git a/debian/changelog b/debian/changelog
index a9e8cec..42959be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ vulkan (1.0.5.0+dfsg1-1) UNRELEASED; urgency=medium
* New upstream release.
* patches: Refreshed.
+ * Don't build smoke demo, needs glslang like tri/cube.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 15 Mar 2016 15:27:12 +0200
diff --git a/debian/patches/demos-add-install-rule.diff b/debian/patches/demos-add-install-rule.diff
index a886cf9..0dd3c65 100644
--- a/debian/patches/demos-add-install-rule.diff
+++ b/debian/patches/demos-add-install-rule.diff
@@ -1,11 +1,9 @@
Description: Add an install rule for vulkaninfo
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
-@@ -89,6 +89,7 @@ endif()
+@@ -89,3 +89,5 @@ endif()
add_executable(vulkaninfo vulkaninfo.c)
target_link_libraries(vulkaninfo ${LIBRARIES})
+install(TARGETS vulkaninfo RUNTIME DESTINATION /usr/bin)
-
-
- add_subdirectory(smoke)
++
diff --git a/debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff b/debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff
new file mode 100644
index 0000000..0a4743f
--- /dev/null
+++ b/debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff
@@ -0,0 +1,40 @@
+commit f63cbe944107b5cd8f150ceaaec43b26099d5688
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Feb 16 10:05:25 2016 -0500
+
+ demos: Don't build tri or cube
+
+ There are more interesting demos, all we really want here is vulkaninfo.
+ This helps because we don't need to pre-build glslang/llvm/lunarglass
+ just to get the loader and layers.
+
+--- a/demos/CMakeLists.txt
++++ b/demos/CMakeLists.txt
+@@ -89,27 +89,3 @@ endif()
+
+ add_executable(vulkaninfo vulkaninfo.c)
+ target_link_libraries(vulkaninfo ${LIBRARIES})
+-
+-if(UNIX)
+- add_executable(tri tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
+-else()
+- add_executable(tri WIN32 tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
+-endif()
+-target_link_libraries(tri ${LIBRARIES})
+-
+-if(NOT WIN32)
+- add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
+- target_link_libraries(cube ${LIBRARIES})
+-else()
+- if (CMAKE_CL_64)
+- set (LIB_DIR "Win64")
+- else()
+- set (LIB_DIR "Win32")
+- endif()
+-
+- add_executable(cube WIN32 cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
+- target_link_libraries(cube ${LIBRARIES} )
+-endif()
+-
+-add_subdirectory(smoke)
+-
diff --git a/debian/patches/demos-dont-build-tri-or-cube.diff b/debian/patches/demos-dont-build-tri-or-cube.diff
deleted file mode 100644
index a7d3c3f..0000000
--- a/debian/patches/demos-dont-build-tri-or-cube.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-commit f63cbe944107b5cd8f150ceaaec43b26099d5688
-Author: Adam Jackson <ajax@redhat.com>
-Date: Tue Feb 16 10:05:25 2016 -0500
-
- demos: Don't build tri or cube
-
- There are more interesting demos, all we really want here is vulkaninfo.
- This helps because we don't need to pre-build glslang/llvm/lunarglass
- just to get the loader and layers.
-
---- a/demos/CMakeLists.txt
-+++ b/demos/CMakeLists.txt
-@@ -90,26 +90,6 @@ endif()
- add_executable(vulkaninfo vulkaninfo.c)
- target_link_libraries(vulkaninfo ${LIBRARIES})
-
--if(UNIX)
-- add_executable(tri tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
--else()
-- add_executable(tri WIN32 tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
--endif()
--target_link_libraries(tri ${LIBRARIES})
--
--if(NOT WIN32)
-- add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
-- target_link_libraries(cube ${LIBRARIES})
--else()
-- if (CMAKE_CL_64)
-- set (LIB_DIR "Win64")
-- else()
-- set (LIB_DIR "Win32")
-- endif()
--
-- add_executable(cube WIN32 cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
-- target_link_libraries(cube ${LIBRARIES} )
--endif()
-
- add_subdirectory(smoke)
-
diff --git a/debian/patches/series b/debian/patches/series
index 8561267..1343caa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
trim-build.diff
-demos-dont-build-tri-or-cube.diff
+demos-dont-build-tri-or-cube-or-smoke.diff
loader-add-install-rule.diff
demos-add-install-rule.diff
layers-use-local-spirv-hpp.diff
commit 913cddc4bd0d95bd85dd866d2c352cf478d7829b
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Mar 15 15:33:37 2016 +0200
patches: Refreshed.
diff --git a/debian/changelog b/debian/changelog
index 67300fa..a9e8cec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vulkan (1.0.5.0+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * patches: Refreshed.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 15 Mar 2016 15:27:12 +0200
+
vulkan (1.0.3.1+dfsg1-1) unstable; urgency=low
* Initial release (Closes: #814922)
diff --git a/debian/patches/demos-add-install-rule.diff b/debian/patches/demos-add-install-rule.diff
index c1f56e2..a886cf9 100644
--- a/debian/patches/demos-add-install-rule.diff
+++ b/debian/patches/demos-add-install-rule.diff
@@ -1,8 +1,11 @@
Description: Add an install rule for vulkaninfo
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
-@@ -93,3 +93,4 @@ else()
- add_executable(vulkaninfo WIN32 vulkaninfo.c)
- endif()
+@@ -89,6 +89,7 @@ endif()
+
+ add_executable(vulkaninfo vulkaninfo.c)
target_link_libraries(vulkaninfo ${LIBRARIES})
+install(TARGETS vulkaninfo RUNTIME DESTINATION /usr/bin)
+
+
+ add_subdirectory(smoke)
diff --git a/debian/patches/demos-dont-build-tri-or-cube.diff b/debian/patches/demos-dont-build-tri-or-cube.diff
index f26490e..a7d3c3f 100644
--- a/debian/patches/demos-dont-build-tri-or-cube.diff
+++ b/debian/patches/demos-dont-build-tri-or-cube.diff
@@ -8,15 +8,12 @@ Date: Tue Feb 16 10:05:25 2016 -0500
This helps because we don't need to pre-build glslang/llvm/lunarglass
just to get the loader and layers.
-diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
-index ebc406b..a21760b 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
-@@ -93,24 +93,3 @@ else()
- add_executable(vulkaninfo WIN32 vulkaninfo.c)
- endif()
+@@ -90,26 +90,6 @@ endif()
+ add_executable(vulkaninfo vulkaninfo.c)
target_link_libraries(vulkaninfo ${LIBRARIES})
--
+
-if(UNIX)
- add_executable(tri tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv)
-else()
@@ -37,3 +34,6 @@ index ebc406b..a21760b 100644
- add_executable(cube WIN32 cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
- target_link_libraries(cube ${LIBRARIES} )
-endif()
+
+ add_subdirectory(smoke)
+
diff --git a/debian/patches/layers-install-to-cmake-install-libdir.diff b/debian/patches/layers-install-to-cmake-install-libdir.diff
index 8362d88..fc41ffd 100644
--- a/debian/patches/layers-install-to-cmake-install-libdir.diff
+++ b/debian/patches/layers-install-to-cmake-install-libdir.diff
@@ -6,7 +6,7 @@ Date: Wed Feb 10 15:11:54 2016 -0500
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
-@@ -70,7 +70,7 @@ else()
+@@ -77,7 +77,7 @@ else()
target_link_Libraries(VkLayer_${target} layer_utils)
add_dependencies(VkLayer_${target} generate_vk_layer_helpers)
set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic")
@@ -15,7 +15,7 @@ Date: Wed Feb 10 15:11:54 2016 -0500
endmacro()
endif()
-@@ -144,7 +144,7 @@ if (WIN32)
+@@ -156,7 +156,7 @@ if (WIN32)
set_target_properties(layer_utils_static PROPERTIES OUTPUT_NAME layer_utils)
target_link_libraries(layer_utils)
else()
@@ -23,4 +23,4 @@ Date: Wed Feb 10 15:11:54 2016 -0500
+ install(TARGETS layer_utils DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
- add_vk_layer(draw_state draw_state.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp)
+ add_vk_layer(draw_state draw_state.cpp vk_layer_table.cpp)
diff --git a/debian/patches/layers-use-local-spirv-hpp.diff b/debian/patches/layers-use-local-spirv-hpp.diff
index 0ca9c1f..0bcf960 100644
--- a/debian/patches/layers-use-local-spirv-hpp.diff
+++ b/debian/patches/layers-use-local-spirv-hpp.diff
@@ -1,6 +1,6 @@
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
-@@ -79,7 +79,7 @@ include_directories(
+@@ -86,7 +86,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../loader
${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
${CMAKE_CURRENT_BINARY_DIR}
diff --git a/debian/patches/loader-add-install-rule.diff b/debian/patches/loader-add-install-rule.diff
index 707a99f..9c52313 100644
--- a/debian/patches/loader-add-install-rule.diff
+++ b/debian/patches/loader-add-install-rule.diff
@@ -4,13 +4,11 @@ Date: Wed Feb 10 15:17:06 2016 -0500
loader: Add install rule
-diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 835c23a..d55adc7 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
-@@ -47,4 +47,5 @@ if (NOT WIN32)
+@@ -60,4 +60,5 @@ else()
add_library(vulkan SHARED ${LOADER_SRCS})
- set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.3")
+ set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.5")
target_link_libraries(vulkan -ldl -lpthread -lm)
+ install(TARGETS vulkan DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
diff --git a/debian/patches/trim-build.diff b/debian/patches/trim-build.diff
index aeace9d..50ae880 100644
--- a/debian/patches/trim-build.diff
+++ b/debian/patches/trim-build.diff
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -65,10 +65,10 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_C
+@@ -77,10 +77,10 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_C
endif()
option(BUILD_LOADER "Build loader" ON)
commit 7b6a2505a4e2a8678e57f0a982d59467518ac0bc
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Mar 15 15:25:41 2016 +0200
Delete stuff we can't ship or are useless to us.
diff --git a/tests/gtest-1.7.0/CHANGES b/tests/gtest-1.7.0/CHANGES
deleted file mode 100644
index 0552132..0000000
--- a/tests/gtest-1.7.0/CHANGES
+++ /dev/null
@@ -1,157 +0,0 @@
-Changes for 1.7.0:
-
-* New feature: death tests are supported on OpenBSD and in iOS
- simulator now.
-* New feature: Google Test now implements a protocol to allow
- a test runner to detect that a test program has exited
- prematurely and report it as a failure (before it would be
- falsely reported as a success if the exit code is 0).
-* New feature: Test::RecordProperty() can now be used outside of the
- lifespan of a test method, in which case it will be attributed to
- the current test case or the test program in the XML report.
-* New feature (potentially breaking): --gtest_list_tests now prints
- the type parameters and value parameters for each test.
-* Improvement: char pointers and char arrays are now escaped properly
- in failure messages.
-* Improvement: failure summary in XML reports now includes file and
- line information.
-* Improvement: the <testsuites> XML element now has a timestamp attribute.
-* Improvement: When --gtest_filter is specified, XML report now doesn't
- contain information about tests that are filtered out.
-* Fixed the bug where long --gtest_filter flag values are truncated in
- death tests.
-* Potentially breaking change: RUN_ALL_TESTS() is now implemented as a
- function instead of a macro in order to work better with Clang.
-* Compatibility fixes with C++ 11 and various platforms.
-* Bug/warning fixes.
-
-Changes for 1.6.0:
-
-* New feature: ADD_FAILURE_AT() for reporting a test failure at the
- given source location -- useful for writing testing utilities.
-* New feature: the universal value printer is moved from Google Mock
- to Google Test.
-* New feature: type parameters and value parameters are reported in
- the XML report now.
-* A gtest_disable_pthreads CMake option.
-* Colored output works in GNU Screen sessions now.
-* Parameters of value-parameterized tests are now printed in the
- textual output.
-* Failures from ad hoc test assertions run before RUN_ALL_TESTS() are
- now correctly reported.
-* Arguments of ASSERT_XY and EXPECT_XY no longer need to support << to
- ostream.
-* More complete handling of exceptions.
-* GTEST_ASSERT_XY can be used instead of ASSERT_XY in case the latter
- name is already used by another library.
-* --gtest_catch_exceptions is now true by default, allowing a test
- program to continue after an exception is thrown.
-* Value-parameterized test fixtures can now derive from Test and
- WithParamInterface<T> separately, easing conversion of legacy tests.
-* Death test messages are clearly marked to make them more
- distinguishable from other messages.
-* Compatibility fixes for Android, Google Native Client, MinGW, HP UX,
- PowerPC, Lucid autotools, libCStd, Sun C++, Borland C++ Builder (Code Gear),
- IBM XL C++ (Visual Age C++), and C++0x.
-* Bug fixes and implementation clean-ups.
-* Potentially incompatible changes: disables the harmful 'make install'
- command in autotools.
-
-Changes for 1.5.0:
-
- * New feature: assertions can be safely called in multiple threads
- where the pthreads library is available.
- * New feature: predicates used inside EXPECT_TRUE() and friends
- can now generate custom failure messages.
- * New feature: Google Test can now be compiled as a DLL.
- * New feature: fused source files are included.
- * New feature: prints help when encountering unrecognized Google Test flags.
- * Experimental feature: CMake build script (requires CMake 2.6.4+).
- * Experimental feature: the Pump script for meta programming.
- * double values streamed to an assertion are printed with enough precision
- to differentiate any two different values.
- * Google Test now works on Solaris and AIX.
- * Build and test script improvements.
- * Bug fixes and implementation clean-ups.
-
- Potentially breaking changes:
-
- * Stopped supporting VC++ 7.1 with exceptions disabled.
- * Dropped support for 'make install'.
-
-Changes for 1.4.0:
-
- * New feature: the event listener API
- * New feature: test shuffling
- * New feature: the XML report format is closer to junitreport and can
- be parsed by Hudson now.
- * New feature: when a test runs under Visual Studio, its failures are
- integrated in the IDE.
- * New feature: /MD(d) versions of VC++ projects.
- * New feature: elapsed time for the tests is printed by default.
- * New feature: comes with a TR1 tuple implementation such that Boost
- is no longer needed for Combine().
- * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
- * New feature: the Xcode project can now produce static gtest
- libraries in addition to a framework.
- * Compatibility fixes for Solaris, Cygwin, minGW, Windows Mobile,
- Symbian, gcc, and C++Builder.
- * Bug fixes and implementation clean-ups.
-
-Changes for 1.3.0:
-
- * New feature: death tests on Windows, Cygwin, and Mac.
- * New feature: ability to use Google Test assertions in other testing
- frameworks.
- * New feature: ability to run disabled test via
- --gtest_also_run_disabled_tests.
- * New feature: the --help flag for printing the usage.
- * New feature: access to Google Test flag values in user code.
- * New feature: a script that packs Google Test into one .h and one
- .cc file for easy deployment.
- * New feature: support for distributing test functions to multiple
- machines (requires support from the test runner).
- * Bug fixes and implementation clean-ups.
-
-Changes for 1.2.1:
-
- * Compatibility fixes for Linux IA-64 and IBM z/OS.
- * Added support for using Boost and other TR1 implementations.
- * Changes to the build scripts to support upcoming release of Google C++
- Mocking Framework.
- * Added Makefile to the distribution package.
- * Improved build instructions in README.
-
-Changes for 1.2.0:
-
- * New feature: value-parameterized tests.
- * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
- macros.
- * Changed the XML report format to match JUnit/Ant's.
- * Added tests to the Xcode project.
- * Added scons/SConscript for building with SCons.
- * Added src/gtest-all.cc for building Google Test from a single file.
- * Fixed compatibility with Solaris and z/OS.
- * Enabled running Python tests on systems with python 2.3 installed,
- e.g. Mac OS X 10.4.
- * Bug fixes.
-
-Changes for 1.1.0:
-
- * New feature: type-parameterized tests.
- * New feature: exception assertions.
- * New feature: printing elapsed time of tests.
- * Improved the robustness of death tests.
- * Added an Xcode project and samples.
- * Adjusted the output format on Windows to be understandable by Visual Studio.
- * Minor bug fixes.
-
-Changes for 1.0.1:
-
- * Added project files for Visual Studio 7.1.
- * Fixed issues with compiling on Mac OS X.
- * Fixed issues with compiling on Cygwin.
-
-Changes for 1.0.0:
-
- * Initial Open Source release of Google Test
diff --git a/tests/gtest-1.7.0/CMakeLists.txt b/tests/gtest-1.7.0/CMakeLists.txt
deleted file mode 100644
index d9e395c..0000000
--- a/tests/gtest-1.7.0/CMakeLists.txt
+++ /dev/null
@@ -1,252 +0,0 @@
-########################################################################
-# CMake build script for Google Test.
-#
-# To run the tests for Google Test itself on Linux, use 'make test' or
-# ctest. You can select which tests to run using 'ctest -R regex'.
-# For more options, run 'ctest --help'.
-
-# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
-# make it prominent in the GUI.
-option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." ON)
-
-# When other libraries are using a shared version of runtime libraries,
-# Google Test also has to use one.
-option(
- gtest_force_shared_crt
- "Use shared (DLL) run-time lib even when Google Test is built as static lib."
- OFF)
-
-option(gtest_build_tests "Build all of gtest's own tests." OFF)
-
-option(gtest_build_samples "Build gtest's sample programs." OFF)
-
-option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
-
-# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
-include(cmake/hermetic_build.cmake OPTIONAL)
-
-if (COMMAND pre_project_set_up_hermetic_build)
- pre_project_set_up_hermetic_build()
-endif()
-
-########################################################################
-#
-# Project-wide settings
-
-# Name of the project.
-#
-# CMake files in this project can refer to the root source directory
-# as ${gtest_SOURCE_DIR} and to the root binary directory as
-# ${gtest_BINARY_DIR}.
-# Language "C" is required for find_package(Threads).
-project(gtest CXX C)
-cmake_minimum_required(VERSION 2.6.2)
-
-if (COMMAND set_up_hermetic_build)
- set_up_hermetic_build()
-endif()
-
-# Define helper functions and macros used by Google Test.
-include(cmake/internal_utils.cmake)
-
-config_compiler_and_linker() # Defined in internal_utils.cmake.
-
-# Where Google Test's .h files can be found.
-include_directories(
- ${gtest_SOURCE_DIR}/include
- ${gtest_SOURCE_DIR})
-
-# Where Google Test's libraries can be found.
-link_directories(${gtest_BINARY_DIR}/src)
-
-########################################################################
-#
-# Defines the gtest & gtest_main libraries. User tests should link
-# with one of them.
-
-# Google Test libraries. We build them using more strict warnings than what
-# are used for other targets, to ensure that gtest can be compiled by a user
-# aggressive about warnings.
-cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-target_link_libraries(gtest_main gtest)
-
-########################################################################
-#
-# Samples on how to link user tests with gtest or gtest_main.
-#
-# They are not built by default. To build them, set the
-# gtest_build_samples option to ON. You can do it by running ccmake
-# or specifying the -Dgtest_build_samples=ON flag when running cmake.
-
-if (gtest_build_samples)
- cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
- cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
- cxx_executable(sample3_unittest samples gtest_main)
- cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
- cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
- cxx_executable(sample6_unittest samples gtest_main)
- cxx_executable(sample7_unittest samples gtest_main)
- cxx_executable(sample8_unittest samples gtest_main)
- cxx_executable(sample9_unittest samples gtest)
- cxx_executable(sample10_unittest samples gtest)
-endif()
-
-########################################################################
-#
-# Google Test's own tests.
-#
-# You can skip this section if you aren't interested in testing
-# Google Test itself.
-#
-# The tests are not built by default. To build them, set the
-# gtest_build_tests option to ON. You can do it by running ccmake
-# or specifying the -Dgtest_build_tests=ON flag when running cmake.
-
-if (gtest_build_tests)
- # This must be set in the root directory for the tests to be run by
- # 'make test' or ctest.
- enable_testing()
-
- ############################################################
- # C++ tests built with standard compiler flags.
-
- cxx_test(gtest-death-test_test gtest_main)
- cxx_test(gtest_environment_test gtest)
- cxx_test(gtest-filepath_test gtest_main)
- cxx_test(gtest-linked_ptr_test gtest_main)
- cxx_test(gtest-listener_test gtest_main)
- cxx_test(gtest_main_unittest gtest_main)
- cxx_test(gtest-message_test gtest_main)
- cxx_test(gtest_no_test_unittest gtest)
- cxx_test(gtest-options_test gtest_main)
- cxx_test(gtest-param-test_test gtest
- test/gtest-param-test2_test.cc)
- cxx_test(gtest-port_test gtest_main)
- cxx_test(gtest_pred_impl_unittest gtest_main)
- cxx_test(gtest_premature_exit_test gtest
- test/gtest_premature_exit_test.cc)
- cxx_test(gtest-printers_test gtest_main)
- cxx_test(gtest_prod_test gtest_main
- test/production.cc)
- cxx_test(gtest_repeat_test gtest)
- cxx_test(gtest_sole_header_test gtest_main)
- cxx_test(gtest_stress_test gtest)
- cxx_test(gtest-test-part_test gtest_main)
- cxx_test(gtest_throw_on_failure_ex_test gtest)
- cxx_test(gtest-typed-test_test gtest_main
- test/gtest-typed-test2_test.cc)
- cxx_test(gtest_unittest gtest_main)
- cxx_test(gtest-unittest-api_test gtest)
-
- ############################################################
- # C++ tests built with non-standard compiler flags.
-
- # MSVC 7.1 does not support STL with exceptions disabled.
- if (NOT MSVC OR MSVC_VERSION GREATER 1310)
- cxx_library(gtest_no_exception "${cxx_no_exception}"
- src/gtest-all.cc)
- cxx_library(gtest_main_no_exception "${cxx_no_exception}"
- src/gtest-all.cc src/gtest_main.cc)
- endif()
- cxx_library(gtest_main_no_rtti "${cxx_no_rtti}"
- src/gtest-all.cc src/gtest_main.cc)
-
- cxx_test_with_flags(gtest-death-test_ex_nocatch_test
- "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0"
- gtest test/gtest-death-test_ex_test.cc)
- cxx_test_with_flags(gtest-death-test_ex_catch_test
- "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"
- gtest test/gtest-death-test_ex_test.cc)
-
- cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}"
- gtest_main_no_rtti test/gtest_unittest.cc)
-
- cxx_shared_library(gtest_dll "${cxx_default}"
- src/gtest-all.cc src/gtest_main.cc)
-
- cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}"
- gtest_dll test/gtest_all_test.cc)
- set_target_properties(gtest_dll_test_
- PROPERTIES
- COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
-
- if (NOT MSVC OR NOT MSVC_VERSION EQUAL 1600)
- # The C++ Standard specifies tuple_element<int, class>.
- # Yet MSVC 10's <utility> declares tuple_element<size_t, class>.
- # That declaration conflicts with our own standard-conforming
- # tuple implementation. Therefore using our own tuple with
- # MSVC 10 doesn't compile.
- cxx_library(gtest_main_use_own_tuple "${cxx_use_own_tuple}"
- src/gtest-all.cc src/gtest_main.cc)
-
- cxx_test_with_flags(gtest-tuple_test "${cxx_use_own_tuple}"
- gtest_main_use_own_tuple test/gtest-tuple_test.cc)
-
- cxx_test_with_flags(gtest_use_own_tuple_test "${cxx_use_own_tuple}"
- gtest_main_use_own_tuple
- test/gtest-param-test_test.cc test/gtest-param-test2_test.cc)
- endif()
-
- ############################################################
- # Python tests.
-
- cxx_executable(gtest_break_on_failure_unittest_ test gtest)
- py_test(gtest_break_on_failure_unittest)
-
- # MSVC 7.1 does not support STL with exceptions disabled.
- if (NOT MSVC OR MSVC_VERSION GREATER 1310)
- cxx_executable_with_flags(
- gtest_catch_exceptions_no_ex_test_
- "${cxx_no_exception}"
- gtest_main_no_exception
- test/gtest_catch_exceptions_test_.cc)
- endif()
-
- cxx_executable_with_flags(
- gtest_catch_exceptions_ex_test_
- "${cxx_exception}"
- gtest_main
- test/gtest_catch_exceptions_test_.cc)
- py_test(gtest_catch_exceptions_test)
-
- cxx_executable(gtest_color_test_ test gtest)
- py_test(gtest_color_test)
-
- cxx_executable(gtest_env_var_test_ test gtest)
- py_test(gtest_env_var_test)
-
- cxx_executable(gtest_filter_unittest_ test gtest)
- py_test(gtest_filter_unittest)
-
- cxx_executable(gtest_help_test_ test gtest_main)
- py_test(gtest_help_test)
-
- cxx_executable(gtest_list_tests_unittest_ test gtest)
- py_test(gtest_list_tests_unittest)
-
- cxx_executable(gtest_output_test_ test gtest)
- py_test(gtest_output_test)
-
- cxx_executable(gtest_shuffle_test_ test gtest)
- py_test(gtest_shuffle_test)
-
- # MSVC 7.1 does not support STL with exceptions disabled.
- if (NOT MSVC OR MSVC_VERSION GREATER 1310)
- cxx_executable(gtest_throw_on_failure_test_ test gtest_no_exception)
- set_target_properties(gtest_throw_on_failure_test_
- PROPERTIES
- COMPILE_FLAGS "${cxx_no_exception}")
- py_test(gtest_throw_on_failure_test)
- endif()
-
- cxx_executable(gtest_uninitialized_test_ test gtest)
- py_test(gtest_uninitialized_test)
-
- cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
- cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
- py_test(gtest_xml_outfiles_test)
-
- cxx_executable(gtest_xml_output_unittest_ test gtest)
- py_test(gtest_xml_output_unittest)
-endif()
diff --git a/tests/gtest-1.7.0/CONTRIBUTORS b/tests/gtest-1.7.0/CONTRIBUTORS
deleted file mode 100644
index feae2fc..0000000
--- a/tests/gtest-1.7.0/CONTRIBUTORS
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file contains a list of people who've made non-trivial
-# contribution to the Google C++ Testing Framework project. People
-# who commit code to the project are encouraged to add their names
-# here. Please keep the list sorted by first names.
-
-Ajay Joshi <jaj@google.com>
-Balázs Dán <balazs.dan@gmail.com>
-Bharat Mediratta <bharat@menalto.com>
-Chandler Carruth <chandlerc@google.com>
-Chris Prince <cprince@google.com>
-Chris Taylor <taylorc@google.com>
-Dan Egnor <egnor@google.com>
-Eric Roman <eroman@chromium.org>
-Hady Zalek <hady.zalek@gmail.com>
-Jeffrey Yasskin <jyasskin@google.com>
-Jói Sigurðsson <joi@google.com>
-Keir Mierle <mierle@gmail.com>
-Keith Ray <keith.ray@gmail.com>
-Kenton Varda <kenton@google.com>
-Manuel Klimek <klimek@google.com>
-Markus Heule <markus.heule@gmail.com>
-Mika Raento <mikie@iki.fi>
-Miklós Fazekas <mfazekas@szemafor.com>
-Pasi Valminen <pasi.valminen@gmail.com>
-Patrick Hanna <phanna@google.com>
-Patrick Riley <pfr@google.com>
-Peter Kaminski <piotrk@google.com>
-Preston Jackson <preston.a.jackson@gmail.com>
-Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com>
-Russ Cox <rsc@google.com>
-Russ Rufer <russ@pentad.com>
-Sean Mcafee <eefacm@gmail.com>
-Sigurður Ásgeirsson <siggi@google.com>
-Tracy Bialik <tracy@pentad.com>
-Vadim Berman <vadimb@google.com>
-Vlad Losev <vladl@google.com>
-Zhanyong Wan <wan@google.com>
diff --git a/tests/gtest-1.7.0/LICENSE b/tests/gtest-1.7.0/LICENSE
deleted file mode 100644
index 1941a11..0000000
--- a/tests/gtest-1.7.0/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/gtest-1.7.0/Makefile.am b/tests/gtest-1.7.0/Makefile.am
deleted file mode 100644
index 9c96b42..0000000
--- a/tests/gtest-1.7.0/Makefile.am
+++ /dev/null
@@ -1,306 +0,0 @@
-# Automake file
-
-ACLOCAL_AMFLAGS = -I m4
-
-# Nonstandard package files for distribution
-EXTRA_DIST = \
- CHANGES \
- CONTRIBUTORS \
- LICENSE \
- include/gtest/gtest-param-test.h.pump \
- include/gtest/internal/gtest-param-util-generated.h.pump \
- include/gtest/internal/gtest-tuple.h.pump \
- include/gtest/internal/gtest-type-util.h.pump \
- make/Makefile \
- scripts/fuse_gtest_files.py \
- scripts/gen_gtest_pred_impl.py \
- scripts/pump.py \
- scripts/test/Makefile
-
Reply to: