projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix utc compile error for gcc-11" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-environment-variable.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
index
f02bfb4
..
3bd51bc
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
22
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,34
+18,31
@@
#include "toolkit-environment-variable.h"
// EXTERNAL INCLUDE
#include "toolkit-environment-variable.h"
// EXTERNAL INCLUDE
-#include <cstddef>
+#include <map>
+#include <string>
namespace Dali
{
namespace Dali
{
-
namespace EnvironmentVariable
{
namespace EnvironmentVariable
{
-
namespace
{
namespace
{
-
const char * gReturnValue = NULL
;
-}
+
std::map<std::string, std::string> gEnvironmentVariables
;
+}
// namespace
-const char
* GetEnvironmentVariable( const char * variable
)
+const char
* GetEnvironmentVariable(const char* variable
)
{
{
- return gReturnValue;
+ auto value = gEnvironmentVariables.find(variable);
+ if(value != gEnvironmentVariables.end())
+ {
+ return value->second.c_str();
+ }
+ return nullptr;
}
}
-void SetTest
ingEnvironmentVariable( bool testing
)
+void SetTest
EnvironmentVariable(const char* variable, const char* value
)
{
{
- if( testing )
- {
- gReturnValue = "1";
- }
- else
- {
- gReturnValue = NULL;
- }
+ gEnvironmentVariables[variable] = value;
}
} // namespace EnvironmentVariable
}
} // namespace EnvironmentVariable