From 59ad959e8532d802d4e07edc8dd16097b6b769ca Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 24 Oct 2019 18:23:14 +0200 Subject: [PATCH] tests/ecore: ensure that we attempt to re-set PATH in ecore-file tests Summary: if this test failed before for any reason, PATH would be permanently changed for the current shell and process, which is obviously not what we want Depends on D10414 Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10415 --- src/tests/ecore/ecore_test_ecore_file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/tests/ecore/ecore_test_ecore_file.c b/src/tests/ecore/ecore_test_ecore_file.c index d2ca012206..e41ce02fe5 100644 --- a/src/tests/ecore/ecore_test_ecore_file.c +++ b/src/tests/ecore/ecore_test_ecore_file.c @@ -407,11 +407,25 @@ EFL_START_TEST(ecore_test_ecore_file_path) ret = ecore_file_init(); res = ecore_file_app_installed(dest_file); + if (!res) + { + /* attempt to mitigate cascading failures */ + ret = setenv("PATH", src_dir, 1); + fail_if(ret != 0); + } fail_if(res != EINA_TRUE); res = ecore_file_app_installed(src_file); + if (!res) + { + /* attempt to mitigate cascading failures */ + ret = setenv("PATH", src_dir, 1); + fail_if(ret != 0); + } fail_if(res != EINA_TRUE); list = NULL; list = ecore_file_app_list(); + ret = setenv("PATH", src_dir, 1); + fail_if(ret != 0); fd = 0; EINA_LIST_FOREACH(list, l, path) { @@ -424,8 +438,6 @@ EFL_START_TEST(ecore_test_ecore_file_path) fail_if(fd == 0); EINA_LIST_FREE(list, dup_dir) free(dup_dir); - ret = setenv("PATH", src_dir, 1); - fail_if(ret != 0); fail_if(ecore_file_remove(src_file) != EINA_TRUE);