[devel] [PATCH 1 of 1] ntf/test: use stat on ntfsv_test_classes.xml before immcfg [#575]

[Carl J. <car...@er...>]

 tests/ntfsv/test_ntf_imcn.c |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


Do not use a negative response from immcfg as an implicit method
to find the ntfsv_test_classes.xml file. A negative command
response is interpreted by the test framework as if the whole
test case failed. Instead, use stat() to check if the file is located
in the most probable place, then proceed with immcfg, and if not
found then try the alternative location.

diff --git a/tests/ntfsv/test_ntf_imcn.c b/tests/ntfsv/test_ntf_imcn.c
--- a/tests/ntfsv/test_ntf_imcn.c
+++ b/tests/ntfsv/test_ntf_imcn.c
@@ -4259,13 +4259,16 @@ void objectDeleteTest_3404(void)
 
 __attribute__((constructor)) static void notificationFilterVerification_constructor(void)
 {
-	int rc = system("immcfg -f //hostfs//repl-opensaf//ntfsv_test_classes.xml");
+        struct stat buf;
+        int rc = 0;
+        if (stat("//hostfs//ntfsv_test_classes.xml", &buf) == 0) {
+            rc = system("immcfg -f //hostfs//ntfsv_test_classes.xml");
+        } else {
+            rc = system("immcfg -f //hostfs//repl-opensaf//ntfsv_test_classes.xml");
+        }
 	if (rc != 0) {
-            rc = system("immcfg -f //hostfs//ntfsv_test_classes.xml");
-            if (rc != 0) {
-		printf("ntfsv_test_classes.xml file not installed (see README)");
-		return;
-            }
+	    printf("ntfsv_test_classes.xml file not installed (see README)");
+	    return;
 	}
 	test_suite_add(32, "CM notifications test");
 	test_case_add(32, objectCreateTest_01, "CREATE, runtime (OsafNtfCmTestRT) object");