Skip to content

Commit 505806c

Browse files
authored
Merge pull request #7949 from rabbitmq/mergify/bp/v3.12.x/pr-7938
Adjust `-include(...` in some tests to work with both bazel and make (backport #7938)
2 parents f1a1f4a + 2478159 commit 505806c

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

deps/rabbit/test/rabbit_fifo_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
-include_lib("eunit/include/eunit.hrl").
1414
-include_lib("rabbit_common/include/rabbit.hrl").
1515
-include_lib("rabbit_common/include/rabbit_framing.hrl").
16-
-include("rabbit_fifo.hrl").
16+
-include("src/rabbit_fifo.hrl").
1717

1818
%%%===================================================================
1919
%%% Common Test callbacks

deps/rabbit/test/rabbit_fifo_dlx_SUITE.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
-compile(export_all).
1111

1212
-include_lib("eunit/include/eunit.hrl").
13-
-include("rabbit_fifo.hrl").
14-
-include("rabbit_fifo_dlx.hrl").
13+
-include("src/rabbit_fifo.hrl").
14+
-include("src/rabbit_fifo_dlx.hrl").
1515
-include_lib("rabbit_common/include/rabbit.hrl").
1616

1717
%%%===================================================================

deps/rabbit/test/rabbit_fifo_prop_SUITE.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
-include_lib("proper/include/proper.hrl").
1010
-include_lib("common_test/include/ct.hrl").
1111
-include_lib("eunit/include/eunit.hrl").
12-
-include("rabbit_fifo.hrl").
13-
-include("rabbit_fifo_dlx.hrl").
12+
-include("src/rabbit_fifo.hrl").
13+
-include("src/rabbit_fifo_dlx.hrl").
1414
-include_lib("rabbit_common/include/rabbit.hrl").
1515

1616
-define(record_info(T,R),lists:zip(record_info(fields,T),tl(tuple_to_list(R)))).

deps/rabbit/test/rabbit_fifo_v0_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-include_lib("common_test/include/ct.hrl").
1212
-include_lib("eunit/include/eunit.hrl").
1313
-include_lib("rabbit_common/include/rabbit.hrl").
14-
-include("rabbit_fifo_v0.hrl").
14+
-include("src/rabbit_fifo_v0.hrl").
1515

1616
%%%===================================================================
1717
%%% Common Test callbacks

deps/rabbit/test/rabbit_stream_coordinator_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
-include_lib("eunit/include/eunit.hrl").
1010
-include_lib("rabbit_common/include/rabbit.hrl").
11-
-include("rabbit_stream_coordinator.hrl").
11+
-include("src/rabbit_stream_coordinator.hrl").
1212

1313
-define(STATE, rabbit_stream_coordinator).
1414

deps/rabbit/test/rabbit_stream_sac_coordinator_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
-compile(export_all).
2020

2121
-include_lib("eunit/include/eunit.hrl").
22-
-include("rabbit_stream_sac_coordinator.hrl").
22+
-include("src/rabbit_stream_sac_coordinator.hrl").
2323

2424
%%%===================================================================
2525
%%% Common Test callbacks

0 commit comments

Comments
 (0)