Use mosq_test.get_build_root()

2 years ago · 4a7da066e0
parent 41f0d34348
commit 4a7da066e0
39 changed files with 40 additions and 39 deletions
--- a/test/broker/14-dynsec-config-init-env.py
+++ b/test/broker/14-dynsec-config-init-env.py
@ -8,7 +8,7 @@ def write_config(filename, port):
    with open(filename, 'w') as f:
        f.write("listener %d\n" % (port))
        f.write("allow_anonymous false\n")
-        f.write("plugin ../../plugins/dynamic-security/mosquitto_dynamic_security.so\n")
+        f.write(f"plugin {mosq_test.get_build_root()}/plugins/dynamic-security/mosquitto_dynamic_security.so\n")
        f.write("plugin_opt_config_file %d/dynamic-security.json\n" % (port))


--- a/test/broker/14-dynsec-config-init-file.py
+++ b/test/broker/14-dynsec-config-init-file.py
@ -8,7 +8,7 @@ def write_config(filename, port):
    with open(filename, 'w') as f:
        f.write("listener %d\n" % (port))
        f.write("allow_anonymous false\n")
-        f.write("plugin ../../plugins/dynamic-security/mosquitto_dynamic_security.so\n")
+        f.write(f"plugin {mosq_test.get_build_root()}/plugins/dynamic-security/mosquitto_dynamic_security.so\n")
        f.write("plugin_opt_config_file %d/dynamic-security.json\n" % (port))
        f.write("plugin_opt_password_init_file %d/init\n" % (port))

--- a/test/broker/14-dynsec-config-init-random.py
+++ b/test/broker/14-dynsec-config-init-random.py
@ -8,7 +8,7 @@ def write_config(filename, port):
    with open(filename, 'w') as f:
        f.write("listener %d\n" % (port))
        f.write("allow_anonymous false\n")
-        f.write("plugin ../../plugins/dynamic-security/mosquitto_dynamic_security.so\n")
+        f.write(f"plugin {mosq_test.get_build_root()}/plugins/dynamic-security/mosquitto_dynamic_security.so\n")
        f.write("plugin_opt_config_file %d/dynamic-security.json\n" % (port))


--- a/test/broker/persist_sqlite.py
+++ b/test/broker/persist_sqlite.py
@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 import sqlite3
+import mosq_test

 dir_in = 0
 dir_out = 1
@ -22,7 +23,7 @@ def write_config(filename, port):
    with open(filename, 'w') as f:
        f.write("listener %d\n" % (port))
        f.write("allow_anonymous true\n")
-        f.write("plugin ../../plugins/persist-sqlite/mosquitto_persist_sqlite.so\n")
+        f.write(f"plugin {mosq_test.get_build_root()}/plugins/persist-sqlite/mosquitto_persist_sqlite.so\n")
        f.write("plugin_opt_db_file %d/mosquitto.sqlite3\n" % (port))


--- a/test/client/02-subscribe-argv-errors-tls-psk.py
+++ b/test/client/02-subscribe-argv-errors-tls-psk.py
@ -13,7 +13,7 @@ def do_test(args, stderr_expected, rc_expected):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub'] + args

    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    if mosq_test.wait_for_subprocess(sub):
--- a/test/client/02-subscribe-argv-errors-tls.py
+++ b/test/client/02-subscribe-argv-errors-tls.py
@ -13,7 +13,7 @@ def do_test(args, stderr_expected, rc_expected):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub'] + args

    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    if mosq_test.wait_for_subprocess(sub):
--- a/test/client/02-subscribe-argv-errors-without-tls.py
+++ b/test/client/02-subscribe-argv-errors-without-tls.py
@ -13,7 +13,7 @@ def do_test(args, stderr_expected, rc_expected):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub'] + args

    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    if mosq_test.wait_for_subprocess(sub):
--- a/test/client/02-subscribe-filter-out.py
+++ b/test/client/02-subscribe-filter-out.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-q', '0',
            '-t', '02/sub/filter-out/#',
--- a/test/client/02-subscribe-format-json-properties.py
+++ b/test/client/02-subscribe-format-json-properties.py
@ -21,7 +21,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-q', '1',
            '-F', '%j',
--- a/test/client/02-subscribe-format-json-qos0.py
+++ b/test/client/02-subscribe-format-json-qos0.py
@ -21,7 +21,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-F', '%j',
            '-t', '02/sub/format/json/test',
--- a/test/client/02-subscribe-format-json-qos1.py
+++ b/test/client/02-subscribe-format-json-qos1.py
@ -21,7 +21,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-q', '1',
            '-F', '%j',
--- a/test/client/02-subscribe-format-json-retain.py
+++ b/test/client/02-subscribe-format-json-retain.py
@ -21,7 +21,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-F', '%j',
            '-t', '02/sub/format/json/retain/test',
--- a/test/client/02-subscribe-format.py
+++ b/test/client/02-subscribe-format.py
@ -20,7 +20,7 @@ def do_test(format_str, expected_output, proto_ver=4, payload="message"):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-q', '1',
            '-t', '02/sub/format/test',
--- a/test/client/02-subscribe-null.py
+++ b/test/client/02-subscribe-null.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-q', '1',
            '-t', '02/sub/null/test',
--- a/test/client/02-subscribe-qos1-ws.py
+++ b/test/client/02-subscribe-qos1-ws.py
@ -28,7 +28,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(ports[0]),
            '-q', '1',
            '-t', '02/sub/qos1/test',
--- a/test/client/02-subscribe-qos1.py
+++ b/test/client/02-subscribe-qos1.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-q', '1',
            '-t', '02/sub/qos1/test',
--- a/test/client/02-subscribe-verbose.py
+++ b/test/client/02-subscribe-verbose.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_sub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_sub',
            '-p', str(port),
            '-q', '1',
            '-t', '02/sub/verbose/test',
--- a/test/client/03-publish-argv-errors-tls-psk.py
+++ b/test/client/03-publish-argv-errors-tls-psk.py
@ -13,7 +13,7 @@ def do_test(args, stderr_expected, rc_expected):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub'] + args

    pub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    if mosq_test.wait_for_subprocess(pub):
--- a/test/client/03-publish-argv-errors-tls.py
+++ b/test/client/03-publish-argv-errors-tls.py
@ -13,7 +13,7 @@ def do_test(args, stderr_expected, rc_expected):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub'] + args

    pub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    if mosq_test.wait_for_subprocess(pub):
--- a/test/client/03-publish-argv-errors-without-tls.py
+++ b/test/client/03-publish-argv-errors-without-tls.py
@ -13,7 +13,7 @@ def do_test(args, stderr_expected, rc_expected):
       'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub'] + args

    pub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    if mosq_test.wait_for_subprocess(pub):
--- a/test/client/03-publish-file-empty.py
+++ b/test/client/03-publish-file-empty.py
@ -26,7 +26,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(port),
            '-q', '1',
            '-t', '03/pub/file/empty/test',
--- a/test/client/03-publish-file.py
+++ b/test/client/03-publish-file.py
@ -28,7 +28,7 @@ def do_test(proto_ver):
    }
    env = mosq_test.env_add_ld_library_path(env)

-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(port),
            '-q', '1',
            '-t', '03/pub/file/test',
--- a/test/client/03-publish-options-file.py
+++ b/test/client/03-publish-options-file.py
@ -29,7 +29,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-o', conf_file
            ]

--- a/test/client/03-publish-qos0-empty.py
+++ b/test/client/03-publish-qos0-empty.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(port),
            '-q', '0',
            '-t', '03/pub/qos0/test',
--- a/test/client/03-publish-qos1-properties.py
+++ b/test/client/03-publish-qos1-properties.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
    else:
        V = 'mqttv31'

-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(port),
            '-q', '1',
            '-t', '03/pub/qos1/test/properties',
--- a/test/client/03-publish-qos1-ws-large.py
+++ b/test/client/03-publish-qos1-ws-large.py
@ -31,7 +31,7 @@ def do_test(proto_ver):

    payload = "abcdefghijklmnopqrstuvwxyz0123456789"*1821

-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(ports[0]),
            '-q', '1',
            '-t', '03/pub/qos1/test',
--- a/test/client/03-publish-qos1-ws.py
+++ b/test/client/03-publish-qos1-ws.py
@ -28,7 +28,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(ports[0]),
            '-q', '1',
            '-t', '03/pub/qos1/test',
--- a/test/client/03-publish-qos1.py
+++ b/test/client/03-publish-qos1.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(port),
            '-q', '1',
            '-t', '03/pub/qos1/test',
--- a/test/client/03-publish-repeat.py
+++ b/test/client/03-publish-repeat.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(port),
            '-q', '1',
            '-t', '03/pub/repeat/test',
--- a/test/client/03-publish-socks.py
+++ b/test/client/03-publish-socks.py
@ -40,7 +40,7 @@ def do_test(proto_ver, host):
    }
    env = mosq_test.env_add_ld_library_path(env)
    cmd = [
-            '../../client/mosquitto_pub',
+            f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-h', host,
            '-p', str(port2),
            '-q', '1',
--- a/test/client/03-publish-stdin-file.py
+++ b/test/client/03-publish-stdin-file.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(port),
            '-q', '1',
            '-t', '03/pub/stdin/file/test',
--- a/test/client/03-publish-stdin-line.py
+++ b/test/client/03-publish-stdin-line.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-p', str(port),
            '-q', '2',
            '-t', '03/pub/stdin/line/test',
--- a/test/client/03-publish-url.py
+++ b/test/client/03-publish-url.py
@ -20,7 +20,7 @@ def do_test(proto_ver):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_pub',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_pub',
            '-L', f'mqtt://localhost:{port}/03/pub/url/test',
            '-m', 'message',
            '-V', V
--- a/test/client/04-rr-argv-errors-tls-psk.py
+++ b/test/client/04-rr-argv-errors-tls-psk.py
@ -14,7 +14,7 @@ def do_test(args, stderr_expected, rc_expected):
    }
    env = mosq_test.env_add_ld_library_path(env)

-    cmd = ['../../client/mosquitto_rr'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_rr'] + args

    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    sub.wait()
--- a/test/client/04-rr-argv-errors-tls.py
+++ b/test/client/04-rr-argv-errors-tls.py
@ -13,7 +13,7 @@ def do_test(args, stderr_expected, rc_expected):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_rr'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_rr'] + args

    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    sub.wait()
--- a/test/client/04-rr-argv-errors-without-tls.py
+++ b/test/client/04-rr-argv-errors-without-tls.py
@ -13,7 +13,7 @@ def do_test(args, stderr_expected, rc_expected):
        'XDG_CONFIG_HOME':'/tmp/missing'
    }
    env = mosq_test.env_add_ld_library_path(env)
-    cmd = ['../../client/mosquitto_rr'] + args
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_rr'] + args

    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
    sub.wait()
--- a/test/client/04-rr-qos1-ws.py
+++ b/test/client/04-rr-qos1-ws.py
@ -29,7 +29,7 @@ def do_test(proto_ver):
    }
    env = mosq_test.env_add_ld_library_path(env)
    payload = "message"
-    cmd = ['../../client/mosquitto_rr',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_rr',
            '-p', str(ports[0]),
            '-q', '1',
            '-t', '04/rr/qos1/test/request',
--- a/test/client/04-rr-qos1.py
+++ b/test/client/04-rr-qos1.py
@ -21,7 +21,7 @@ def do_test(proto_ver):
    }
    env = mosq_test.env_add_ld_library_path(env)
    payload = "message"
-    cmd = ['../../client/mosquitto_rr',
+    cmd = [f'{mosq_test.get_build_root()}/client/mosquitto_rr',
            '-p', str(port),
            '-q', '1',
            '-t', '04/rr/qos1/test/request',
--- a/test/random/test.py
+++ b/test/random/test.py
@ -40,5 +40,5 @@ def run_clients(max_clients):


 env = mosq_test.env_add_ld_library_path()
-#broker = subprocess.Popen(["../../src/mosquitto", "-c", "random.conf"], env=env)
+#broker = subprocess.Popen([mosq_test.get_build_root()+"/src/mosquitto", "-c", "random.conf"], env=env)
 run_clients(1000)