diff options
author | Luca Bruno <luca.bruno@coreos.com> | 2022-01-10 17:38:50 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-10 17:38:50 +0000 |
commit | 7cc84819078aec6b9637b3ad29712ca3e2f8433e (patch) | |
tree | 197674a5e932e37afe0b11b95575570de3a688af /tests | |
parent | 92025018f6c64b608ef7f8d8fab27dc18ee90c7f (diff) | |
parent | 0bdba574d735ae37447d4c1e8bd0b6a4e622da79 (diff) | |
download | ostree-7cc84819078aec6b9637b3ad29712ca3e2f8433e.tar.gz |
Merge pull request #2513 from lucab/ups/setenv-error
ostree: check g_setenv return value
Diffstat (limited to 'tests')
-rw-r--r-- | tests/libostreetest.c | 3 | ||||
-rw-r--r-- | tests/test-gpg-verify-result.c | 3 | ||||
-rw-r--r-- | tests/test-rollsum-cli.c | 3 | ||||
-rw-r--r-- | tests/test-varint.c | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/tests/libostreetest.c b/tests/libostreetest.c index d5671a1e..08abb9f1 100644 --- a/tests/libostreetest.c +++ b/tests/libostreetest.c @@ -155,7 +155,8 @@ ot_test_setup_sysroot (GCancellable *cancellable, } /* Make sure deployments are mutable */ - g_setenv ("OSTREE_SYSROOT_DEBUG", buf->str, TRUE); + if (!g_setenv ("OSTREE_SYSROOT_DEBUG", buf->str, TRUE)) + return glnx_null_throw (error, "Failed to set environment variable OSTREE_SYSROOT_DEBUG"); g_autoptr(GFile) sysroot_path = g_file_new_for_path ("sysroot"); return ostree_sysroot_new (sysroot_path); diff --git a/tests/test-gpg-verify-result.c b/tests/test-gpg-verify-result.c index d49224ec..8485b888 100644 --- a/tests/test-gpg-verify-result.c +++ b/tests/test-gpg-verify-result.c @@ -78,7 +78,8 @@ test_fixture_setup (TestFixture *fixture, * certificates for certain test cases. */ homedir = g_test_build_filename (G_TEST_DIST, "tests/gpg-verify-data", NULL); - g_setenv ("GNUPGHOME", homedir, TRUE); + gboolean is_ok = g_setenv ("GNUPGHOME", homedir, TRUE); + g_assert (is_ok == TRUE); result = g_initable_new (OSTREE_TYPE_GPG_VERIFY_RESULT, NULL, &local_error, NULL); diff --git a/tests/test-rollsum-cli.c b/tests/test-rollsum-cli.c index 44e3390c..2cf730d3 100644 --- a/tests/test-rollsum-cli.c +++ b/tests/test-rollsum-cli.c @@ -35,7 +35,8 @@ main (int argc, char **argv) OstreeRollsumMatches *matches; GMappedFile *mfile; - g_setenv ("GIO_USE_VFS", "local", TRUE); + gboolean is_ok = g_setenv ("GIO_USE_VFS", "local", TRUE); + g_assert (is_ok == TRUE); if (argc < 3) return 1; diff --git a/tests/test-varint.c b/tests/test-varint.c index e86c008f..3fea805e 100644 --- a/tests/test-varint.c +++ b/tests/test-varint.c @@ -58,7 +58,8 @@ int main (int argc, char **argv) { - g_setenv ("GIO_USE_VFS", "local", TRUE); + gboolean is_ok = g_setenv ("GIO_USE_VFS", "local", TRUE); + g_assert (is_ok == TRUE); g_test_init (&argc, &argv, NULL); |