Skip to content

Commit e393a18

Browse files
author
MarcoFalke
committed
Merge #13964: ci: Add Appveyor CI
1f6ff04 Use wildcard path in test_bitcoin.vcxproj (Chun Kuan Lee) 90cc69c ci: Add appveyor.yml to build on MSVC (Chun Kuan Lee) 4d0c792 Make macro compatible with MSVC (Chun Kuan Lee) Pull request description: Introduce Appveyor CI for MSVC. This would require the owner adding appveyor to this repo. Also fix some MSVC incompatible code. This `appveyor.yml` file is modified from @sipsorcery and @NicolasDorier 's code in #12613. Appveyor CI result: https://ci.appveyor.com/project/ken2812221/bitcoin/build/1.0.151 Tree-SHA512: b5b0f1686a33e54325ea6de81606806a7d9a0f8d4acbb97c9ce598386e8fcb2220def264777609ed2b850ac8c490fd181303ea522c5a70487272d46995f4c52d
2 parents 63f8b01 + 1f6ff04 commit e393a18

File tree

3 files changed

+40
-68
lines changed

3 files changed

+40
-68
lines changed

‎appveyor.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
skip_tags: true
2+
image: Visual Studio 2017
3+
configuration: Release
4+
platform: x64
5+
environment:
6+
APPVEYOR_SAVE_CACHE_ON_ERROR: true
7+
cache: C:\tools\vcpkg\installed\
8+
before_build:
9+
- ps: >-
10+
$packages = @(
11+
"boost-filesystem",
12+
"boost-signals2",
13+
"boost-interprocess",
14+
"boost-test",
15+
"libevent",
16+
"openssl",
17+
"zeromq",
18+
"berkeleydb",
19+
"secp256k1",
20+
"leveldb"
21+
)
22+
23+
for ($i=0; $i -lt $packages.length; $i++) {
24+
$all_packages += $packages[$i] + ":" + $env:PLATFORM + "-windows-static "
25+
}
26+
27+
Invoke-Expression -Command "vcpkg install $all_packages"
28+
build:
29+
project: build_msvc\bitcoin.sln
30+
parallel: true
31+
verbosity: minimal
32+
test_script:
33+
- cmd: build_msvc\%PLATFORM%\Release\test_bitcoin.exe
34+
deploy: off

‎build_msvc/test_bitcoin/test_bitcoin.vcxproj

Lines changed: 3 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -20,72 +20,10 @@
2020
</ProjectConfiguration>
2121
</ItemGroup>
2222
<ItemGroup>
23-
<ClCompile Include="..\..\src\test\addrman_tests.cpp" />
24-
<ClCompile Include="..\..\src\test\allocator_tests.cpp" />
25-
<ClCompile Include="..\..\src\test\amount_tests.cpp" />
26-
<ClCompile Include="..\..\src\test\arith_uint256_tests.cpp" />
27-
<ClCompile Include="..\..\src\test\base32_tests.cpp" />
28-
<ClCompile Include="..\..\src\test\base58_tests.cpp" />
29-
<ClCompile Include="..\..\src\test\base64_tests.cpp" />
30-
<ClCompile Include="..\..\src\test\bech32_tests.cpp" />
31-
<ClCompile Include="..\..\src\test\bip32_tests.cpp" />
32-
<ClCompile Include="..\..\src\test\blockchain_tests.cpp" />
33-
<ClCompile Include="..\..\src\test\blockencodings_tests.cpp" />
34-
<ClCompile Include="..\..\src\test\bloom_tests.cpp" />
35-
<ClCompile Include="..\..\src\test\bswap_tests.cpp" />
36-
<ClCompile Include="..\..\src\test\checkqueue_tests.cpp" />
37-
<ClCompile Include="..\..\src\test\coins_tests.cpp" />
38-
<ClCompile Include="..\..\src\test\compress_tests.cpp" />
39-
<ClCompile Include="..\..\src\test\crypto_tests.cpp" />
40-
<ClCompile Include="..\..\src\test\cuckoocache_tests.cpp" />
41-
<ClCompile Include="..\..\src\test\dbwrapper_tests.cpp" />
42-
<ClCompile Include="..\..\src\test\denialofservice_tests.cpp" />
43-
<ClCompile Include="..\..\src\test\getarg_tests.cpp" />
44-
<ClCompile Include="..\..\src\test\hash_tests.cpp" />
45-
<ClCompile Include="..\..\src\test\key_tests.cpp" />
46-
<ClCompile Include="..\..\src\test\limitedmap_tests.cpp" />
47-
<ClCompile Include="..\..\src\test\main_tests.cpp" />
48-
<ClCompile Include="..\..\src\test\mempool_tests.cpp" />
49-
<ClCompile Include="..\..\src\test\merkle_tests.cpp" />
50-
<ClCompile Include="..\..\src\test\miner_tests.cpp" />
51-
<ClCompile Include="..\..\src\test\multisig_tests.cpp" />
52-
<ClCompile Include="..\..\src\test\netbase_tests.cpp" />
53-
<ClCompile Include="..\..\src\test\net_tests.cpp" />
54-
<ClCompile Include="..\..\src\test\pmt_tests.cpp" />
55-
<ClCompile Include="..\..\src\test\policyestimator_tests.cpp" />
56-
<ClCompile Include="..\..\src\test\pow_tests.cpp" />
57-
<ClCompile Include="..\..\src\test\prevector_tests.cpp" />
58-
<ClCompile Include="..\..\src\test\raii_event_tests.cpp" />
59-
<ClCompile Include="..\..\src\test\random_tests.cpp" />
60-
<ClCompile Include="..\..\src\test\reverselock_tests.cpp" />
61-
<ClCompile Include="..\..\src\test\rpc_tests.cpp" />
62-
<ClCompile Include="..\..\src\test\sanity_tests.cpp" />
63-
<ClCompile Include="..\..\src\test\scheduler_tests.cpp" />
64-
<ClCompile Include="..\..\src\test\scriptnum_tests.cpp" />
65-
<ClCompile Include="..\..\src\test\script_p2sh_tests.cpp" />
66-
<ClCompile Include="..\..\src\test\script_standard_tests.cpp" />
67-
<ClCompile Include="..\..\src\test\script_tests.cpp" />
68-
<ClCompile Include="..\..\src\test\serialize_tests.cpp" />
69-
<ClCompile Include="..\..\src\test\sighash_tests.cpp" />
70-
<ClCompile Include="..\..\src\test\sigopcount_tests.cpp" />
71-
<ClCompile Include="..\..\src\test\skiplist_tests.cpp" />
72-
<ClCompile Include="..\..\src\test\streams_tests.cpp" />
23+
<ClCompile Include="..\..\src\test\*_tests.cpp" />
24+
<ClCompile Include="..\..\src\wallet\test\*_tests.cpp" />
7325
<ClCompile Include="..\..\src\test\test_bitcoin.cpp" />
7426
<ClCompile Include="..\..\src\test\test_bitcoin_main.cpp" />
75-
<ClCompile Include="..\..\src\test\timedata_tests.cpp" />
76-
<ClCompile Include="..\..\src\test\torcontrol_tests.cpp" />
77-
<ClCompile Include="..\..\src\test\transaction_tests.cpp" />
78-
<ClCompile Include="..\..\src\test\txindex_tests.cpp" />
79-
<ClCompile Include="..\..\src\test\txvalidationcache_tests.cpp" />
80-
<ClCompile Include="..\..\src\test\uint256_tests.cpp" />
81-
<ClCompile Include="..\..\src\test\util_tests.cpp" />
82-
<ClCompile Include="..\..\src\test\validation_block_tests.cpp" />
83-
<ClCompile Include="..\..\src\test\versionbits_tests.cpp" />
84-
<ClCompile Include="..\..\src\wallet\test\accounting_tests.cpp" />
85-
<ClCompile Include="..\..\src\wallet\test\coinselector_tests.cpp" />
86-
<ClCompile Include="..\..\src\wallet\test\psbt_wallet_tests.cpp" />
87-
<ClCompile Include="..\..\src\wallet\test\wallet_crypto_tests.cpp" />
88-
<ClCompile Include="..\..\src\wallet\test\wallet_tests.cpp" />
8927
<ClCompile Include="..\..\src\wallet\test\wallet_test_fixture.cpp" />
9028
</ItemGroup>
9129
<ItemGroup>
@@ -266,4 +204,4 @@
266204
</Target>
267205
<Import Label="configTarget" Project="..\common.vcxproj" />
268206
<Import Label="hexdumpTarget" Project="..\msbuild\tasks\hexdump.targets" />
269-
</Project>
207+
</Project>

‎src/ui_interface.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ class CClientUIInterface
7575
MSG_ERROR = (ICON_ERROR | BTN_OK | MODAL)
7676
};
7777

78-
#define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, args...) \
79-
rtype signal_name(args); \
80-
using signal_name##Sig = rtype(args); \
78+
#define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, ...) \
79+
rtype signal_name(__VA_ARGS__); \
80+
using signal_name##Sig = rtype(__VA_ARGS__); \
8181
boost::signals2::connection signal_name##_connect(std::function<signal_name##Sig> fn); \
8282
void signal_name##_disconnect(std::function<signal_name##Sig> fn);
8383

0 commit comments

Comments
 (0)