-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add capnproto/0.9.1 #7429
Merged
Merged
Add capnproto/0.9.1 #7429
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
185 changes: 185 additions & 0 deletions
185
recipes/capnproto/all/patches/0010-disable-tests-for-0.9.1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| Disable tests for 0.9.1 | ||
|
|
||
| --- | ||
| c++/Makefile.am | 168 ------------------------------------------------ | ||
| 1 file changed, 168 deletions(-) | ||
|
|
||
| diff --git a/c++/Makefile.am b/c++/Makefile.am | ||
| index 1e3fd8e9..488e54d5 100644 | ||
| --- a/c++/Makefile.am | ||
| +++ b/c++/Makefile.am | ||
| @@ -444,171 +444,3 @@ endif LITE_MODE | ||
| # src/capnp/serialize-snappy* | ||
| # src/capnp/benchmark/... | ||
| # src/capnp/compiler/... | ||
| - | ||
| -# Tests ============================================================== | ||
| - | ||
| -test_capnpc_inputs = \ | ||
| - src/capnp/test.capnp \ | ||
| - src/capnp/test-import.capnp \ | ||
| - src/capnp/test-import2.capnp \ | ||
| - src/capnp/compat/json-test.capnp | ||
| - | ||
| -test_capnpc_outputs = \ | ||
| - src/capnp/test.capnp.c++ \ | ||
| - src/capnp/test.capnp.h \ | ||
| - src/capnp/test-import.capnp.c++ \ | ||
| - src/capnp/test-import.capnp.h \ | ||
| - src/capnp/test-import2.capnp.c++ \ | ||
| - src/capnp/test-import2.capnp.h \ | ||
| - src/capnp/compat/json-test.capnp.c++ \ | ||
| - src/capnp/compat/json-test.capnp.h | ||
| - | ||
| -if USE_EXTERNAL_CAPNP | ||
| - | ||
| -test_capnpc_middleman: $(test_capnpc_inputs) | ||
| - @$(MKDIR_P) src | ||
| - $(CAPNP) compile --src-prefix=$(srcdir)/src -o$(CAPNPC_CXX):src -I$(srcdir)/src $$(for FILE in $(test_capnpc_inputs); do echo $(srcdir)/$$FILE; done) | ||
| - touch test_capnpc_middleman | ||
| - | ||
| -else | ||
| - | ||
| -test_capnpc_middleman: capnp$(EXEEXT) capnpc-c++$(EXEEXT) $(test_capnpc_inputs) | ||
| - @$(MKDIR_P) src | ||
| - ./capnp$(EXEEXT) compile --src-prefix=$(srcdir)/src -o./capnpc-c++$(EXEEXT):src -I$(srcdir)/src $$(for FILE in $(test_capnpc_inputs); do echo $(srcdir)/$$FILE; done) | ||
| - touch test_capnpc_middleman | ||
| - | ||
| -endif | ||
| - | ||
| -$(test_capnpc_outputs): test_capnpc_middleman | ||
| - | ||
| -BUILT_SOURCES = $(test_capnpc_outputs) | ||
| - | ||
| -check_LIBRARIES = libcapnp-test.a | ||
| -libcapnp_test_a_SOURCES = \ | ||
| - src/capnp/test-util.c++ \ | ||
| - src/capnp/test-util.h | ||
| -nodist_libcapnp_test_a_SOURCES = $(test_capnpc_outputs) | ||
| - | ||
| -if LITE_MODE | ||
| - | ||
| -check_PROGRAMS = capnp-test | ||
| -compiler_tests = | ||
| -capnp_test_LDADD = libcapnp-test.a libcapnp.la libkj-test.la libkj.la | ||
| - | ||
| -else !LITE_MODE | ||
| - | ||
| -check_PROGRAMS = capnp-test capnp-evolution-test capnp-afl-testcase | ||
| -if HAS_FUZZING_ENGINE | ||
| - check_PROGRAMS += capnp-llvm-fuzzer-testcase | ||
| -endif | ||
| -heavy_tests = \ | ||
| - src/kj/async-test.c++ \ | ||
| - src/kj/async-xthread-test.c++ \ | ||
| - src/kj/async-unix-test.c++ \ | ||
| - src/kj/async-unix-xthread-test.c++ \ | ||
| - src/kj/async-win32-test.c++ \ | ||
| - src/kj/async-win32-xthread-test.c++ \ | ||
| - src/kj/async-io-test.c++ \ | ||
| - src/kj/async-queue-test.c++ \ | ||
| - src/kj/parse/common-test.c++ \ | ||
| - src/kj/parse/char-test.c++ \ | ||
| - src/kj/std/iostream-test.c++ \ | ||
| - src/kj/compat/url-test.c++ \ | ||
| - src/kj/compat/http-test.c++ \ | ||
| - $(MAYBE_KJ_GZIP_TESTS) \ | ||
| - $(MAYBE_KJ_TLS_TESTS) \ | ||
| - src/capnp/canonicalize-test.c++ \ | ||
| - src/capnp/capability-test.c++ \ | ||
| - src/capnp/membrane-test.c++ \ | ||
| - src/capnp/schema-test.c++ \ | ||
| - src/capnp/schema-loader-test.c++ \ | ||
| - src/capnp/schema-parser-test.c++ \ | ||
| - src/capnp/dynamic-test.c++ \ | ||
| - src/capnp/stringify-test.c++ \ | ||
| - src/capnp/serialize-async-test.c++ \ | ||
| - src/capnp/serialize-text-test.c++ \ | ||
| - src/capnp/rpc-test.c++ \ | ||
| - src/capnp/rpc-twoparty-test.c++ \ | ||
| - src/capnp/ez-rpc-test.c++ \ | ||
| - src/capnp/compat/json-test.c++ \ | ||
| - src/capnp/compat/websocket-rpc-test.c++ \ | ||
| - src/capnp/compiler/lexer-test.c++ \ | ||
| - src/capnp/compiler/type-id-test.c++ | ||
| -capnp_test_LDADD = \ | ||
| - libcapnp-test.a \ | ||
| - libcapnpc.la \ | ||
| - libcapnp-rpc.la \ | ||
| - libcapnp-websocket.la \ | ||
| - libcapnp-json.la \ | ||
| - libcapnp.la \ | ||
| - libkj-http.la \ | ||
| - $(MAYBE_KJ_GZIP_LA) \ | ||
| - $(MAYBE_KJ_TLS_LA) \ | ||
| - libkj-async.la \ | ||
| - libkj-test.la \ | ||
| - libkj.la \ | ||
| - $(ASYNC_LIBS) \ | ||
| - $(PTHREAD_LIBS) | ||
| - | ||
| -endif !LITE_MODE | ||
| - | ||
| -capnp_test_CPPFLAGS = -Wno-deprecated-declarations | ||
| -capnp_test_SOURCES = \ | ||
| - src/kj/common-test.c++ \ | ||
| - src/kj/memory-test.c++ \ | ||
| - src/kj/refcount-test.c++ \ | ||
| - src/kj/array-test.c++ \ | ||
| - src/kj/list-test.c++ \ | ||
| - src/kj/string-test.c++ \ | ||
| - src/kj/string-tree-test.c++ \ | ||
| - src/kj/table-test.c++ \ | ||
| - src/kj/map-test.c++ \ | ||
| - src/kj/encoding-test.c++ \ | ||
| - src/kj/exception-test.c++ \ | ||
| - src/kj/debug-test.c++ \ | ||
| - src/kj/arena-test.c++ \ | ||
| - src/kj/units-test.c++ \ | ||
| - src/kj/tuple-test.c++ \ | ||
| - src/kj/one-of-test.c++ \ | ||
| - src/kj/function-test.c++ \ | ||
| - src/kj/io-test.c++ \ | ||
| - src/kj/mutex-test.c++ \ | ||
| - src/kj/time-test.c++ \ | ||
| - src/kj/threadlocal-test.c++ \ | ||
| - src/kj/filesystem-test.c++ \ | ||
| - src/kj/filesystem-disk-test.c++ \ | ||
| - src/kj/test-test.c++ \ | ||
| - src/capnp/common-test.c++ \ | ||
| - src/capnp/blob-test.c++ \ | ||
| - src/capnp/endian-test.c++ \ | ||
| - src/capnp/endian-fallback-test.c++ \ | ||
| - src/capnp/endian-reverse-test.c++ \ | ||
| - src/capnp/layout-test.c++ \ | ||
| - src/capnp/any-test.c++ \ | ||
| - src/capnp/message-test.c++ \ | ||
| - src/capnp/encoding-test.c++ \ | ||
| - src/capnp/orphan-test.c++ \ | ||
| - src/capnp/serialize-test.c++ \ | ||
| - src/capnp/serialize-packed-test.c++ \ | ||
| - src/capnp/fuzz-test.c++ \ | ||
| - $(heavy_tests) | ||
| - | ||
| -if !LITE_MODE | ||
| -capnp_evolution_test_LDADD = libcapnpc.la libcapnp.la libkj.la | ||
| -capnp_evolution_test_SOURCES = src/capnp/compiler/evolution-test.c++ | ||
| - | ||
| -capnp_afl_testcase_LDADD = libcapnp-test.a libcapnp-rpc.la libcapnp.la libkj.la libkj-async.la | ||
| -capnp_afl_testcase_SOURCES = src/capnp/afl-testcase.c++ | ||
| - | ||
| -if HAS_FUZZING_ENGINE | ||
| - capnp_llvm_fuzzer_testcase_LDADD = libcapnp-test.a libcapnp-rpc.la libcapnp.la libkj.la libkj-async.la | ||
| - capnp_llvm_fuzzer_testcase_SOURCES = src/capnp/llvm-fuzzer-testcase.c++ | ||
| - capnp_llvm_fuzzer_testcase_LDFLAGS = $(LIB_FUZZING_ENGINE) | ||
| -endif | ||
| -endif !LITE_MODE | ||
| - | ||
| -if LITE_MODE | ||
| -TESTS = capnp-test | ||
| -else !LITE_MODE | ||
| -TESTS = capnp-test capnp-evolution-test src/capnp/compiler/capnp-test.sh | ||
| -endif !LITE_MODE | ||
| -- | ||
| 2.31.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,3 +3,5 @@ versions: | |
| folder: all | ||
| "0.8.0": | ||
| folder: all | ||
| "0.9.1": | ||
| folder: all | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could this be moved to the main recipe as the fix for the RPATH problems?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found this fix in the test packages for
boostandgsl.The main recipe builds with autotools on Linux/macOS and doesn't require CMake. It seems like the recent version of CMake is just needed on macOS/M1 to build any package depending on libraries with
@rpath.How would it be possible to inject a
build_requireson the depending package? Isbuild_requiresfrom the main package propagated down?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, it's cmake bug, and we didn't upgrade cmake on mac slaves (and cannot at the moment, unfortunately)
the workaround should be in test package
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please, add
#FIXMEto you comment so we can filter it in the future when looking for technical debtThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added the
#FIXMEcomment.