Changeset 80827 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Sep 16, 2019 2:04:02 PM (5 years ago)

Author:

vboxsync

Message:

IPRT: Added RTEnvCreateEx and RTEnvCreateChangeRecordEx so flags can be specified when creating custom environments. Defined one flag RTENV_CREATE_F_ALLOW_EQUAL_FIRST_IN_VAR for accomodating windows style environment variables (used for CWD by driver letter). The flag is set by default on windows hosts, however it does not work for the default environment due to CRT limitations.

Location:

trunk/src/VBox/Runtime/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstRTEnv.cpp (moved) (moved from trunk/src/VBox/Runtime/testcase/tstEnv.cpp ) (6 diffs)

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -62 +62 @@
         tstDir-3 \
         tstRTDvm \
-        tstEnv \
+        tstRTEnv \
         tstRTErrUnique \
         tstFile \
@@ -347 +347 @@
 tstRTDvm_SOURCES = tstRTDvm.cpp
 
-tstEnv_TEMPLATE = VBOXR3TSTEXE
-tstEnv_SOURCES = tstEnv.cpp
+tstRTEnv_TEMPLATE = VBOXR3TSTEXE
+tstRTEnv_SOURCES = tstRTEnv.cpp
 
 tstRTErrUnique_SOURCES = tstRTErrUnique.cpp

trunk/src/VBox/Runtime/testcase/tstRTEnv.cpp

@@ -30 +30 @@
 *********************************************************************************************************************************/
 #include <iprt/env.h>
-#include <iprt/initterm.h>
 #include <iprt/err.h>
 #include <iprt/string.h>
-#include <iprt/stream.h>
+#include <iprt/test.h>
 
 
 int main()
 {
-    RTR3InitExeNoArguments(0);
-    RTPrintf("tstEnv: TESTING...\n");
-
-    int cErrors = 0;
-
-#define CHECK(expr)  do { if (!(expr)) { RTPrintf("tstEnv: error line %d: %s\n", __LINE__, #expr); cErrors++; } } while (0)
-#define CHECK_RC(expr, rc)  do { int rc2 = expr; if (rc2 != (rc)) { RTPrintf("tstEnv: error line %d: %s -> %Rrc expected %Rrc\n", __LINE__, #expr, rc2, rc); cErrors++; } } while (0)
-#define CHECK_STR(str1, str2)  do { if (strcmp(str1, str2)) { RTPrintf("tstEnv: error line %d: '%s' != '%s' (*)\n", __LINE__, str1, str2); cErrors++; } } while (0)
+    RTTEST hTest;
+    RTEXITCODE rcExit = RTTestInitAndCreate("tstRTEnv", &hTest);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        return rcExit;
+    RTTestBanner(hTest);
+
+#define CHECK(expr)             RTTEST_CHECK(hTest, expr)
+#define CHECK_RC(expr, rc)      RTTEST_CHECK_RC(hTest, expr, rc)
+#define CHECK_STR(str1, str2)  do { if (strcmp(str1, str2)) { RTTestFailed(hTest, "line %u: '%s' != '%s' (*)", __LINE__, str1, str2); } } while (0)
+
+    RTTestSub(hTest, "Basics");
 
     /*
@@ -173 +175 @@
     CHECK_STR(szBuf, "MyValue15");
 
+    RTTestDisableAssertions(hTest);
+#ifdef RT_OS_WINDOWS
+    CHECK_RC(RTEnvSetEx(Env, "=C:", "C:\\Temp"), VINF_SUCCESS);
+    CHECK_RC(RTEnvGetEx(Env, "=C:", szBuf, sizeof(szBuf), &cch), VINF_SUCCESS);
+    CHECK_STR(szBuf, "C:\\Temp");
+#else
+    CHECK_RC(RTEnvSetEx(Env, "=C:", "C:\\Temp"), VERR_ENV_INVALID_VAR_NAME);
+    CHECK_RC(RTEnvSetEx(Env, "=", ""), VERR_ENV_INVALID_VAR_NAME);
+#endif
+    CHECK_RC(RTEnvSetEx(Env, "", ""), VERR_ENV_INVALID_VAR_NAME);
+    RTTestRestoreAssertions(hTest);
+
     /*
      * Put.
      */
+    RTTestSub(hTest, "RTEnvPutEx");
     CHECK_RC(RTEnvPutEx(Env, "IPRTMyNewVar28"), VINF_SUCCESS);
     CHECK(!RTEnvExistEx(Env, "IPRTMyNewVar28"));
@@ -191 +206 @@
     CHECK_STR(szBuf, "MyValue15");
 
+    RTTestDisableAssertions(hTest);
+#ifdef RT_OS_WINDOWS
+    CHECK_RC(RTEnvPutEx(Env, "=D:=D:\\Temp"), VINF_SUCCESS);
+    CHECK_RC(RTEnvGetEx(Env, "=D:", szBuf, sizeof(szBuf), &cch), VINF_SUCCESS);
+    CHECK_STR(szBuf, "D:\\Temp");
+#else
+    CHECK_RC(RTEnvPutEx(Env, "=D:=D:\\Temp"), VERR_ENV_INVALID_VAR_NAME);
+    CHECK_RC(RTEnvPutEx(Env, "="), VERR_ENV_INVALID_VAR_NAME);
+#endif
+    CHECK_RC(RTEnvPutEx(Env, ""), VERR_ENV_INVALID_VAR_NAME);
+    RTTestRestoreAssertions(hTest);
+
     /*
      * Dup.
      */
+    RTTestSub(hTest, "RTEnvDupEx");
     char *psz1;
     CHECK(RTEnvDupEx(Env, "NonExistantVariable") == NULL);
@@ -215 +243 @@
      * Another cloning.
      */
+    RTTestSub(hTest, "RTEnvClone");
     RTENV Env2;
     CHECK_RC(RTEnvClone(&Env2, Env), VINF_SUCCESS);
@@ -222 +251 @@
      * execve envp and we're done.
      */
+    RTTestSub(hTest, "RTEnvGetExecEnvP");
     const char * const *papsz = RTEnvGetExecEnvP(RTENV_DEFAULT);
     CHECK(papsz != NULL);
@@ -237 +267 @@
      * Summary
      */
-    if (!cErrors)
-        RTPrintf("tstEnv: SUCCESS\n");
-    else
-        RTPrintf("tstEnv: FAILURE - %d errors\n", cErrors);
-    return !!cErrors;
+    return RTTestSummaryAndDestroy(hTest);
 }