Skip to content

Commit b435362

Browse files
committed
Windows: Test fixes for lib
1 parent 7617795 commit b435362

File tree

64 files changed

+202
-197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+202
-197
lines changed

test/lib/01-con-discon-success-v5.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ def do_test(conn, data):
2222
mosq_test.expect_packet(conn, "disconnect", disconnect_packet)
2323

2424

25-
mosq_test.client_test("c/01-con-discon-success-v5.test", [], do_test, None)
26-
mosq_test.client_test("cpp/01-con-discon-success-v5.test", [], do_test, None)
25+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-con-discon-success-v5.exe"), [], do_test, None)
26+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-con-discon-success-v5.exe"), [], do_test, None)

test/lib/01-con-discon-success.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ def do_test(conn, data):
1818
mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect")
1919
mosq_test.expect_packet(conn, "disconnect", disconnect_packet)
2020

21-
mosq_test.client_test("c/01-con-discon-success.test", [], do_test, None)
22-
mosq_test.client_test("cpp/01-con-discon-success.test", [], do_test, None)
21+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-con-discon-success.exe"), [], do_test, None)
22+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-con-discon-success.exe"), [], do_test, None)

test/lib/01-con-discon-will-clear.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ def do_test(conn, data):
1414
mosq_test.expect_packet(conn, "disconnect", disconnect_packet)
1515

1616

17-
mosq_test.client_test("c/01-con-discon-will-clear.test", [], do_test, None)
18-
mosq_test.client_test("cpp/01-con-discon-will-clear.test", [], do_test, None)
17+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-con-discon-will-clear.exe"), [], do_test, None)
18+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-con-discon-will-clear.exe"), [], do_test, None)

test/lib/01-con-discon-will-v5.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ def do_test(conn, data):
1414
mosq_test.expect_packet(conn, "disconnect", disconnect_packet)
1515

1616

17-
mosq_test.client_test("c/01-con-discon-will-v5.test", [], do_test, None)
18-
mosq_test.client_test("cpp/01-con-discon-will-v5.test", [], do_test, None)
17+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-con-discon-will-v5.exe"), [], do_test, None)
18+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-con-discon-will-v5.exe"), [], do_test, None)

test/lib/01-con-discon-will.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ def do_test(conn, data):
1313
mosq_test.expect_packet(conn, "disconnect", disconnect_packet)
1414

1515

16-
mosq_test.client_test("c/01-con-discon-will.test", [], do_test, None)
17-
mosq_test.client_test("cpp/01-con-discon-will.test", [], do_test, None)
16+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-con-discon-will.exe"), [], do_test, None)
17+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-con-discon-will.exe"), [], do_test, None)

test/lib/01-extended-auth-continue.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ def do_test(conn, data):
2424
mosq_test.expect_packet(conn, "disconnect", disconnect_packet)
2525

2626

27-
mosq_test.client_test("c/01-extended-auth-continue.test", [], do_test, None)
28-
mosq_test.client_test("cpp/01-extended-auth-continue.test", [], do_test, None)
27+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-extended-auth-continue.exe"), [], do_test, None)
28+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-extended-auth-continue.exe"), [], do_test, None)

test/lib/01-extended-auth-failure.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ def do_test(conn, data):
2020
exit(1)
2121

2222

23-
mosq_test.client_test("c/01-extended-auth-failure.test", [], do_test, None)
24-
mosq_test.client_test("cpp/01-extended-auth-failure.test", [], do_test, None)
23+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-extended-auth-failure.exe"), [], do_test, None)
24+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-extended-auth-failure.exe"), [], do_test, None)

test/lib/01-keepalive-pingreq.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ def do_test(conn, data):
2626
mosq_test.expect_packet(conn, "pingreq", pingreq_packet)
2727

2828

29-
mosq_test.client_test("c/01-keepalive-pingreq.test", [], do_test, None)
30-
mosq_test.client_test("cpp/01-keepalive-pingreq.test", [], do_test, None)
29+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-keepalive-pingreq.exe"), [], do_test, None)
30+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-keepalive-pingreq.exe"), [], do_test, None)

test/lib/01-no-clean-session.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ def do_test(conn, data):
1313
mosq_test.expect_packet(conn, "connect", connect_packet)
1414

1515

16-
mosq_test.client_test("c/01-no-clean-session.test", [], do_test, None)
17-
mosq_test.client_test("cpp/01-no-clean-session.test", [], do_test, None)
16+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-no-clean-session.exe"), [], do_test, None)
17+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-no-clean-session.exe"), [], do_test, None)

test/lib/01-pre-connect-callback.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ def do_test(conn, data):
1313
mosq_test.expect_packet(conn, "connect", connect_packet)
1414

1515

16-
mosq_test.client_test("c/01-pre-connect-callback.test", [], do_test, None)
17-
mosq_test.client_test("cpp/01-pre-connect-callback.test", [], do_test, None)
16+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "c", mosq_test.get_build_type(), "01-pre-connect-callback.exe"), [], do_test, None)
17+
mosq_test.client_test(Path(mosq_test.get_build_root(), "test", "lib", "cpp", mosq_test.get_build_type(), "01-pre-connect-callback.exe"), [], do_test, None)

0 commit comments

Comments
 (0)