diff options
| author | Simon Chopin <simon.chopin@canonical.com> | 2022-10-24 16:27:59 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-09-15 16:23:30 +0200 |
| commit | 0a0d607cf52cfb9358b1a385ab2783074d2cb808 (patch) | |
| tree | 0084cba0fdd59d0415c3cd5afb425dbb0661727f | |
| parent | 3ce137c03c94c67ca0b5619558ee500c342a056c (diff) | |
| download | remote-logon-service-0a0d607cf52cfb9358b1a385ab2783074d2cb808.tar.gz remote-logon-service-0a0d607cf52cfb9358b1a385ab2783074d2cb808.tar.bz2 remote-logon-service-0a0d607cf52cfb9358b1a385ab2783074d2cb808.zip | |
tests/server-test: fix the tests on usr-merged systems
The testsuite is failing on Ubuntu builders as they operate with /bin a
symlink to /usr/bin. As a result, depending on how you resolve it, `ls`
can either be `/bin/ls` or `/usr/bin/ls`. Since Debian also seems to
transition to such a setup, it might be wise to simply relax the tests.
| -rw-r--r-- | tests/server-test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/server-test.c b/tests/server-test.c index 9b55246..d339499 100644 --- a/tests/server-test.c +++ b/tests/server-test.c @@ -107,7 +107,8 @@ test_uccs_exec (void) g_assert(server != NULL); g_assert(g_strcmp0(server->name, "My Server") == 0); g_assert(g_strcmp0(server->uri, "http://my.domain.com") == 0); - g_assert(g_strcmp0(UCCS_SERVER(server)->exec, "/bin/ls") == 0); + g_assert(g_strcmp0(UCCS_SERVER(server)->exec, "/bin/ls") == 0 || + g_strcmp0(UCCS_SERVER(server)->exec, "/usr/bin/ls") == 0); g_object_unref(server); g_key_file_unref(keyfile); |