diff --git a/test/src/common/harnessTest.c b/test/src/common/harnessTest.c index b216ac789..8d3dd605c 100644 --- a/test/src/common/harnessTest.c +++ b/test/src/common/harnessTest.c @@ -38,7 +38,9 @@ static const char *testPathData = NULL; static const char *testDataPathData = NULL; static const char *testRepoPathData = NULL; +static char testUserIdData[32]; static char testUserData[64]; +static char testGroupIdData[32]; static char testGroupData[64]; /*********************************************************************************************************************************** @@ -69,6 +71,9 @@ hrnInit( testDataPathData = testDataPath; testRepoPathData = testRepoPath; + // Set test user id + snprintf(testUserIdData, sizeof(testUserIdData), "%u", getuid()); + // Set test user const char *testUserTemp = getpwuid(getuid())->pw_name; @@ -81,6 +86,9 @@ hrnInit( strcpy(testUserData, testUserTemp); + // Set test group id + snprintf(testGroupIdData, sizeof(testGroupIdData), "%u", getgid()); + // Set test group const char *testGroupTemp = getgrgid(getgid())->gr_name; @@ -268,7 +276,9 @@ hrnReplaceKey(const char *string) strcpy(harnessReplaceKeyBuffer, string); hrnReplaceStr(harnessReplaceKeyBuffer, sizeof(harnessReplaceKeyBuffer), "{[path]}", testPath()); hrnReplaceStr(harnessReplaceKeyBuffer, sizeof(harnessReplaceKeyBuffer), "{[path-data]}", testDataPath()); + hrnReplaceStr(harnessReplaceKeyBuffer, sizeof(harnessReplaceKeyBuffer), "{[user-id]}", testUserIdData); hrnReplaceStr(harnessReplaceKeyBuffer, sizeof(harnessReplaceKeyBuffer), "{[user]}", testUser()); + hrnReplaceStr(harnessReplaceKeyBuffer, sizeof(harnessReplaceKeyBuffer), "{[group-id]}", testGroupIdData); hrnReplaceStr(harnessReplaceKeyBuffer, sizeof(harnessReplaceKeyBuffer), "{[group]}", testGroup()); hrnReplaceStr(harnessReplaceKeyBuffer, sizeof(harnessReplaceKeyBuffer), "{[project-exe]}", testProjectExe()); diff --git a/test/src/common/harnessTest.h b/test/src/common/harnessTest.h index 7cc8eee17..793912fae 100644 --- a/test/src/common/harnessTest.h +++ b/test/src/common/harnessTest.h @@ -32,7 +32,9 @@ void hrnFileWrite(const char *fileName, const unsigned char *buffer, size_t buff // // {[path]} - the current test path // {[path-data]} - the current test data path +// {[user-id]} - the current test user id // {[user]} - the current test user +// {[group-id]} - the current test group id // {[group]} - the current test group // {[project-exe]} - the project exe const char *hrnReplaceKey(const char *string);