Skip to content

Commit f8bc4f7

Browse files
martinsumnermartinsumner
committed
Tidy make test
Testing all dependcies no works. The riak-level eunit tests don't run as part of the test dependency run (as they fail due to dependancy issues - but pass as rebar3 eunit). Lager does not run eunit tests (lager fails on OTP22 on the latest release - and as an external dependancy we have to live with that for now). bahso_bench doesn't either (it has no eunit tests and is ony pulled in to handle problems with yokozuna testing). The make rel now copies the release into rel/riak as per Riak 2.9 - for consistency.
1 parent c312eee commit f8bc4f7

File tree

6 files changed

+261
-14
lines changed

6 files changed

+261
-14
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ _build
1212
.DS_Store
1313
rel/vars/*_vars.config
1414
riak.png
15+
log/*
16+
rebar3.crashdump
17+
.eunit

‎Makefile‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ BASE_DIR = $(shell pwd)
66
ERLANG_BIN = $(shell dirname $(shell which erl 2>/dev/null) 2>/dev/null)
77
REBAR ?= $(BASE_DIR)/rebar3
88
OVERLAY_VARS ?=
9-
TEST_IGNORE ?= riak
9+
TEST_IGNORE ?= lager riak basho_bench
1010
TEST_DEPS_DIR ?= _build/test/lib
1111
REL_DIR ?= _build/default/rel
1212
DEPS = $(patsubst $(TEST_DEPS_DIR)/%, %, $(wildcard $(TEST_DEPS_DIR)/*))
@@ -65,21 +65,19 @@ test-deps : compile testclean $(patsubst %, testdep-%, $(TEST_DEPS))
6565
echo Tested the dependencies: $(TEST_DEPS)
6666

6767
# Test each dependency individually in its own VM
68-
test : test-deps
68+
test : testclean test-deps
6969
@if test -s $(TEST_LOG_FILE) ; then \
70-
cat $(TEST_LOG_FILE) | grep FAILED && \
71-
exit `cat $(TEST_LOG_FILE) | grep FAILED | wc -l`; \
72-
fi
73-
$(REBAR) eunit
74-
75-
70+
cat $(TEST_LOG_FILE) && \
71+
exit `cat $(TEST_LOG_FILE) | grep FAILED | wc -l`; \
72+
fi
7673

7774

7875
##
7976
## Release targets
8077
##
8178
rel: locked-deps compile
8279
$(REBAR) as rel release
80+
cp -a _build/rel/rel/riak rel/
8381

8482
rel-rpm: locked-deps compile
8583
$(REBAR) as rel,rpm release

‎apps/riak/test/riak_schema_test.erl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-module(riak_schema_test).
22
-include_lib("eunit/include/eunit.hrl").
3-
-compile(export_all).
3+
-compile([export_all, nowarn_export_all]).
44

55
-define(riak_schema, "priv/riak.schema").
66
-define(eleveldb_schema, "_build/test/lib/eleveldb/priv/eleveldb.schema").

‎eunit.log‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
Eunit: basho_stats PASSED
2+
Eunit: bear PASSED
3+
Eunit: bitcask PASSED
4+
Eunit: canola PASSED
5+
Eunit: clique PASSED
6+
Eunit: cluster_info PASSED
7+
Eunit: cuttlefish PASSED
8+
Eunit: ebloom PASSED
9+
Eunit: eleveldb PASSED
10+
Eunit: exometer_core PASSED
11+
Eunit: folsom PASSED
12+
Eunit: fuse PASSED
13+
Eunit: getopt PASSED
14+
Eunit: goldrush PASSED
15+
Eunit: hut PASSED
16+
Eunit: hyper PASSED
17+
Eunit: ibrowse PASSED
18+
Eunit: kv_index_tictactree PASSED
19+
Eunit: kvc PASSED
20+
Eunit: lager_syslog PASSED
21+
Eunit: leveled PASSED
22+
Eunit: lz4 PASSED
23+
Eunit: meck PASSED
24+
Eunit: mochiweb PASSED
25+
Eunit: parse_trans PASSED
26+
Eunit: pbkdf2 PASSED
27+
Eunit: poolboy PASSED
28+
Eunit: protobuffs PASSED
29+
Eunit: ranch PASSED
30+
Eunit: recon PASSED
31+
Eunit: redbug PASSED
32+
Eunit: riak_api PASSED
33+
Eunit: riak_auth_mods PASSED
34+
Eunit: riak_core PASSED
35+
Eunit: riak_dt PASSED
36+
Eunit: riak_ensemble PASSED
37+
Eunit: riak_kv PASSED
38+
Eunit: riak_pb PASSED
39+
Eunit: riak_pipe PASSED
40+
Eunit: riak_repl PASSED
41+
Eunit: riak_sysmon PASSED
42+
Eunit: riakc PASSED
43+
Eunit: riakhttpc PASSED
44+
Eunit: setup PASSED
45+
Eunit: sext PASSED
46+
Eunit: sidejob PASSED
47+
Eunit: syslog PASSED
48+
Eunit: webmachine PASSED
49+
Eunit: yokozuna PASSED

‎rebar.config‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55

66
{cover_enabled, true}.
77

8-
%% TODO: nowarn_export_all on for now.
9-
{erl_opts, [nowarn_export_all,
10-
debug_info %% , fail_on_warning
11-
]}.
12-
{eunit_opts, [verbose]}.
8+
{erl_opts, [warnings_as_errors]}.
9+
{eunit_opts, [nowarn_export_all, verbose]}.
1310

1411
{deps, [
1512
{lager_syslog, {git, "git://github.com/basho/lager_syslog.git", {branch, "develop-3.0-292"}}},

‎rebar.lock‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
{"1.1.0",
2+
[{<<"basho_bench">>,
3+
{git,"git://github.com/basho/basho_bench.git",
4+
{ref,"97ac1f9a1b9d06e2a986a8479d29626f6a5e5742"}},
5+
1},
6+
{<<"basho_stats">>,
7+
{git,"git://github.com/basho/basho_stats.git",
8+
{ref,"176dee0537b5b3aff57646a7379d435ad990488e"}},
9+
2},
10+
{<<"bear">>,
11+
{git,"git://github.com/boundary/bear.git",
12+
{ref,"0da736b0e9bef2c7150cd6e6c4a9fa1854deedf9"}},
13+
3},
14+
{<<"bitcask">>,
15+
{git,"git://github.com/basho/bitcask.git",
16+
{ref,"dc7dfd8b393a1aca72c0789ecd03e1fab37ecaf0"}},
17+
1},
18+
{<<"canola">>,
19+
{git,"git://github.com/basho/canola.git",
20+
{ref,"2cd39378442f3dc727de22289243b3c4d56f25fd"}},
21+
1},
22+
{<<"clique">>,
23+
{git,"git://github.com/basho/clique.git",
24+
{ref,"5c10755c388b734a5de95e49651e3cb7085321bf"}},
25+
2},
26+
{<<"cluster_info">>,
27+
{git,"git://github.com/basho/cluster_info.git",
28+
{ref,"9ac98b993afbd32f93af8bd0813b7a8cf40529fa"}},
29+
0},
30+
{<<"cuttlefish">>,
31+
{git,"https://github.com/basho/cuttlefish.git",
32+
{ref,"1b4381e5f682d88a2f20ddb8511ff35098c40ea5"}},
33+
3},
34+
{<<"ebloom">>,
35+
{git,"git://github.com/basho/ebloom.git",
36+
{ref,"3c25f9ef61a73d5f1d2c2601da464dd03975721d"}},
37+
1},
38+
{<<"eleveldb">>,
39+
{git,"git://github.com/basho/eleveldb.git",
40+
{ref,"8acb0cac2fadc58102b05921601a178e5f4a1b5b"}},
41+
2},
42+
{<<"exometer_core">>,
43+
{git,"git://github.com/Feuerlabs/exometer_core.git",
44+
{ref,"547f28bc93c7cb3d3f1174fb4c510667a4ebb645"}},
45+
2},
46+
{<<"folsom">>,
47+
{git,"git://github.com/basho/folsom.git",
48+
{ref,"2792fc45737a702bf51ad660e02e0a3d7231399e"}},
49+
2},
50+
{<<"fuse">>,
51+
{git,"https://github.com/jlouis/fuse.git",
52+
{ref,"21c6e52ced3af294f2fe636039106068da12eeeb"}},
53+
1},
54+
{<<"getopt">>,
55+
{git,"git://github.com/jcomellas/getopt",
56+
{ref,"388dc95caa7fb97ec7db8cfc39246a36aba61bd8"}},
57+
2},
58+
{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},2},
59+
{<<"hut">>,{pkg,<<"hut">>,<<"1.2.1">>},3},
60+
{<<"hyper">>,
61+
{git,"git://github.com/basho/hyper",
62+
{ref,"d0bf3d67fd17b8ed2610b266aebd54b1027ea916"}},
63+
1},
64+
{<<"ibrowse">>,
65+
{git,"git://github.com/basho/ibrowse.git",
66+
{ref,"1b129206d45b67270f6901933e35b2ad325fac74"}},
67+
1},
68+
{<<"kv_index_tictactree">>,
69+
{git,"https://github.com/martinsumner/kv_index_tictactree.git",
70+
{ref,"5ae3ffbe21af8f7e405bd06ca5ff2729a1a3d9dd"}},
71+
1},
72+
{<<"kvc">>,
73+
{git,"git://github.com/etrepum/kvc.git",
74+
{ref,"5565fe51857747662410cc3c06362ebcf48a2f04"}},
75+
1},
76+
{<<"lager">>,
77+
{git,"git://github.com/erlang-lager/lager.git",
78+
{ref,"22e62f28e5afabe90a6f31bcde367a2b5799fc94"}},
79+
1},
80+
{<<"lager_syslog">>,
81+
{git,"git://github.com/basho/lager_syslog.git",
82+
{ref,"d0a6a9cc33c1e94b2d8e27d6f709d4d4d8da7c22"}},
83+
0},
84+
{<<"leveled">>,
85+
{git,"https://github.com/martinsumner/leveled.git",
86+
{ref,"4caefcf4aac6e898b706c30640d3615e5d8b12ca"}},
87+
1},
88+
{<<"lz4">>,
89+
{git,"https://github.com/martinsumner/erlang-lz4",
90+
{ref,"d407af5de71303b8e381df718d2e5d05eb775c59"}},
91+
2},
92+
{<<"meck">>,
93+
{git,"git://github.com/eproxus/meck.git",
94+
{ref,"4ecc1ae9089edc6977e8c8c4cd41081513cc5590"}},
95+
3},
96+
{<<"mochiweb">>,
97+
{git,"git://github.com/martinsumner/mochiweb.git",
98+
{ref,"d958d402452cb32c7c6018fbcf451d077d93110f"}},
99+
2},
100+
{<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},3},
101+
{<<"pbkdf2">>,
102+
{git,"git://github.com/basho/erlang-pbkdf2.git",
103+
{ref,"34b5f716fa3ec89ede36d009f7cc8c47bd019dd7"}},
104+
2},
105+
{<<"poolboy">>,
106+
{git,"https://github.com/basho/poolboy.git",
107+
{ref,"8c28a4936ada191211984cda0049543630bf269a"}},
108+
2},
109+
{<<"protobuffs">>,
110+
{git,"https://github.com/basho/erlang_protobuffs.git",
111+
{ref,"098efad8f85dfe556d64e2cf6ce31f2075808f67"}},
112+
2},
113+
{<<"ranch">>,
114+
{git,"git://github.com/ninenines/ranch.git",
115+
{ref,"d0fad24657711cf584da61b5163c29fdafbd9201"}},
116+
1},
117+
{<<"recon">>,
118+
{git,"https://github.com/ferd/recon",
119+
{ref,"75d70c7c08926d2f24f1ee6de14ee50fe8a52763"}},
120+
1},
121+
{<<"redbug">>,
122+
{git,"https://github.com/massemanet/redbug",
123+
{ref,"c583d4567d1e2b8a540593ad0512559798d42565"}},
124+
1},
125+
{<<"riak_api">>,
126+
{git,"git://github.com/basho/riak_api.git",
127+
{ref,"974d15d37099e6d38fad1913082b88c08ed5b8a9"}},
128+
1},
129+
{<<"riak_auth_mods">>,
130+
{git,"git://github.com/basho/riak_auth_mods.git",
131+
{ref,"b41e72957442d0b3427d9f0af9fe49580a9dad4b"}},
132+
0},
133+
{<<"riak_core">>,
134+
{git,"git://github.com/basho/riak_core.git",
135+
{ref,"1e480aee773142ca9f6ba8c4a3ee3f7e46acc7d1"}},
136+
1},
137+
{<<"riak_dt">>,
138+
{git,"git://github.com/basho/riak_dt.git",
139+
{ref,"4edf2ca5f16d5d278a0994376c0db58ee9f97e59"}},
140+
1},
141+
{<<"riak_ensemble">>,
142+
{git,"https://github.com/basho/riak_ensemble",
143+
{ref,"bc662baaaff1d38c1591f03d9ff5541675118acd"}},
144+
2},
145+
{<<"riak_kv">>,
146+
{git,"git://github.com/basho/riak_kv.git",
147+
{ref,"5786564709e631c016571d732f96db18ff1d3c42"}},
148+
0},
149+
{<<"riak_pb">>,
150+
{git,"git://github.com/basho/riak_pb.git",
151+
{ref,"abb4a6c42c44f4c1189fe688552841222037691e"}},
152+
1},
153+
{<<"riak_pipe">>,
154+
{git,"git://github.com/basho/riak_pipe.git",
155+
{ref,"5ce7a2497c4289c6cf2879e97c03fafd212b8563"}},
156+
1},
157+
{<<"riak_repl">>,
158+
{git,"git://github.com/basho/riak_repl.git",
159+
{ref,"68db697e24b09f7e83faab448ecc2c4bfcaf5df9"}},
160+
0},
161+
{<<"riak_sysmon">>,
162+
{git,"git://github.com/basho/riak_sysmon.git",
163+
{ref,"2d3775e468f0779e1cef4e6b9364d28cc7f1ef4a"}},
164+
2},
165+
{<<"riakc">>,
166+
{git,"git://github.com/basho/riak-erlang-client",
167+
{ref,"684b15010661994bf0a9330d3fa779a8f483f5c8"}},
168+
1},
169+
{<<"riakhttpc">>,
170+
{git,"git://github.com/basho/riak-erlang-http-client",
171+
{ref,"2afd692f896f5738c6481cc78010439363484dcd"}},
172+
1},
173+
{<<"setup">>,{pkg,<<"setup">>,<<"2.0.2">>},3},
174+
{<<"sext">>,
175+
{git,"git://github.com/uwiger/sext.git",
176+
{ref,"615eebcf975ec4b4561c6f2b2bc433dabdb2be0f"}},
177+
1},
178+
{<<"sidejob">>,
179+
{git,"git://github.com/basho/sidejob.git",
180+
{ref,"07dedd9b2043c9c6fd03b78fe8699f0f37418743"}},
181+
1},
182+
{<<"syslog">>,
183+
{git,"git://github.com/Vagabond/erlang-syslog",
184+
{ref,"4a6c6f2c996483e86c1320e9553f91d337bcb6aa"}},
185+
1},
186+
{<<"webmachine">>,
187+
{git,"git://github.com/webmachine/webmachine.git",
188+
{ref,"92225b82fc702f78cf9d23248023ec841272df80"}},
189+
2},
190+
{<<"yokozuna">>,
191+
{git,"git://github.com/basho/yokozuna.git",
192+
{ref,"eb70d68b2f257cbf7fedcb6dd5ebd90f6a7976a0"}},
193+
0}]}.
194+
[
195+
{pkg_hash,[
196+
{<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
197+
{<<"hut">>, <<"08D46679523043424870723923971889E8A34D63B2F946A35B46CF921D1236E7">>},
198+
{<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
199+
{<<"setup">>, <<"1203F4CDA11306C2E34434244576DED0A7BBFB0908D9A572356C809BD0CDF085">>}]}
200+
].

0 commit comments

Comments
 (0)