| Index: tests/RTConfRegistryTest.cpp
|
| diff --git a/tests/RTConfRegistryTest.cpp b/tests/RTConfRegistryTest.cpp
|
| index 84ce942bf69d02ff1c0a9fa80ece9ef2a99fc482..be019f70b418507a3df49c7b30f806c33c9c35bc 100644
|
| --- a/tests/RTConfRegistryTest.cpp
|
| +++ b/tests/RTConfRegistryTest.cpp
|
| @@ -6,28 +6,19 @@
|
| */
|
|
|
| #include "SkRTConf.h"
|
| +#include "SkOSEnvironment.h"
|
| #include "Test.h"
|
|
|
| -#include <stdlib.h>
|
| -
|
| // Friended proxy for SkRTConfRegistry::parse()
|
| template <typename T>
|
| bool test_rt_conf_parse(SkRTConfRegistry* reg, const char* key, T* value) {
|
| return reg->parse(key, value);
|
| }
|
|
|
| -static void portable_setenv(const char* key, const char* value) {
|
| -#ifdef SK_BUILD_FOR_WIN32
|
| - _putenv_s(key, value);
|
| -#else
|
| - setenv(key, value, 1);
|
| -#endif
|
| -}
|
| -
|
| DEF_TEST(SkRTConfRegistry, reporter) {
|
| SkRTConfRegistry reg;
|
|
|
| - portable_setenv("skia_nonexistent_item", "132");
|
| + sk_setenv("skia_nonexistent_item", "132");
|
| int result = 0;
|
| test_rt_conf_parse(®, "nonexistent.item", &result);
|
| REPORTER_ASSERT(reporter, result == 132);
|
|
|