Skip to content

Commit cf57d2b

Browse files
authored
[rxcpp] disable tests (#27075)
1 parent 146e976 commit cf57d2b

File tree

5 files changed

+43
-1
lines changed

5 files changed

+43
-1
lines changed

Diff for: ports/rxcpp/disable-tests.patch

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt
2+
index 8856aa42e..2b3d57e97 100755
3+
--- a/projects/CMake/CMakeLists.txt
4+
+++ b/projects/CMake/CMakeLists.txt
5+
@@ -11,18 +11,20 @@ get_filename_component(RXCPP_DIR "${RXCPP_DIR}" PATH)
6+
7+
MESSAGE( STATUS "RXCPP_DIR: " ${RXCPP_DIR} )
8+
9+
-add_subdirectory(${RXCPP_DIR}/Rx/v2/test ${CMAKE_CURRENT_BINARY_DIR}/test)
10+
+if (NOT ${RXCPP_DISABLE_TESTS_AND_EXAMPLES})
11+
+ add_subdirectory(${RXCPP_DIR}/Rx/v2/test ${CMAKE_CURRENT_BINARY_DIR}/test)
12+
13+
-add_subdirectory(${RXCPP_DIR}/projects/doxygen ${CMAKE_CURRENT_BINARY_DIR}/projects/doxygen)
14+
+ add_subdirectory(${RXCPP_DIR}/projects/doxygen ${CMAKE_CURRENT_BINARY_DIR}/projects/doxygen)
15+
16+
-set(EXAMPLES_DIR ${RXCPP_DIR}/Rx/v2/examples)
17+
+ set(EXAMPLES_DIR ${RXCPP_DIR}/Rx/v2/examples)
18+
19+
-add_subdirectory(${EXAMPLES_DIR}/cep ${CMAKE_CURRENT_BINARY_DIR}/examples/cep)
20+
-add_subdirectory(${EXAMPLES_DIR}/stop ${CMAKE_CURRENT_BINARY_DIR}/examples/stop)
21+
-add_subdirectory(${EXAMPLES_DIR}/linesfrombytes ${CMAKE_CURRENT_BINARY_DIR}/examples/linesfrombytes)
22+
-add_subdirectory(${EXAMPLES_DIR}/println ${CMAKE_CURRENT_BINARY_DIR}/examples/println)
23+
-add_subdirectory(${EXAMPLES_DIR}/pythagorian ${CMAKE_CURRENT_BINARY_DIR}/examples/pythagorian)
24+
-add_subdirectory(${EXAMPLES_DIR}/tests ${CMAKE_CURRENT_BINARY_DIR}/examples/tests)
25+
+ add_subdirectory(${EXAMPLES_DIR}/cep ${CMAKE_CURRENT_BINARY_DIR}/examples/cep)
26+
+ add_subdirectory(${EXAMPLES_DIR}/stop ${CMAKE_CURRENT_BINARY_DIR}/examples/stop)
27+
+ add_subdirectory(${EXAMPLES_DIR}/linesfrombytes ${CMAKE_CURRENT_BINARY_DIR}/examples/linesfrombytes)
28+
+ add_subdirectory(${EXAMPLES_DIR}/println ${CMAKE_CURRENT_BINARY_DIR}/examples/println)
29+
+ add_subdirectory(${EXAMPLES_DIR}/pythagorian ${CMAKE_CURRENT_BINARY_DIR}/examples/pythagorian)
30+
+ add_subdirectory(${EXAMPLES_DIR}/tests ${CMAKE_CURRENT_BINARY_DIR}/examples/tests)
31+
+endif ()
32+
33+
# The list of RxCpp source files. Please add every new file to this list
34+
set(RX_SOURCES

Diff for: ports/rxcpp/portfile.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ vcpkg_from_github(
44
REF v4.1.1
55
SHA512 387e1276151a19b62fd1d36b486ff5f3ed28f0f48ae8b00902bf13464d20603f492ecd63ab4444d04293fc3d92a8f7ce3e67a4c68836415c4655331fb6b54edb
66
HEAD_REF master
7+
PATCHES
8+
disable-tests.patch # from https://github.com/ReactiveX/RxCpp/pull/574
79
)
810

911
vcpkg_cmake_configure(

Diff for: ports/rxcpp/vcpkg.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "rxcpp",
33
"version": "4.1.1",
4+
"port-version": 1,
45
"description": "Reactive Extensions for C++",
56
"homepage": "https://github.com/Reactive-Extensions/RxCpp",
67
"license": "Apache-2.0",

Diff for: versions/baseline.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6566,7 +6566,7 @@
65666566
},
65676567
"rxcpp": {
65686568
"baseline": "4.1.1",
6569-
"port-version": 0
6569+
"port-version": 1
65706570
},
65716571
"rxqt": {
65726572
"baseline": "bb2138c",

Diff for: versions/r-/rxcpp.json

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "5f127fb83dfe052e029bd2febf1d9e3eac7ab134",
5+
"version": "4.1.1",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "92ae6c5ff3c5a9f81dda630c0b6cc4e69766ee61",
510
"version": "4.1.1",

0 commit comments

Comments
 (0)