AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util,wgl: Replace usage of putenv with os_unset_option,os_set_option

Browse Source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Antonio Ospite <antonio.ospite@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38640>
This commit is contained in:
Yonggang Luo
2025-11-25 06:10:54 +08:00
committed by Marge Bot
parent 168042fb05
commit 9d3d15f871
5 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/targets/libgl-gdi/meson.build
+1 -1
View File
@@ -45,7 +45,7 @@ if with_tests
'test_wgl',
files('tests/wgl_tests.cpp'),
cpp_args : [cpp_msvc_compat_args, extra_test_defs],
dependencies : [idep_gtest, dep_dxheaders, extra_test_deps],
dependencies : [idep_gtest, idep_mesautil, dep_dxheaders, extra_test_deps],
)
wgl_test_env = environment()
src/gallium/targets/libgl-gdi/tests/wgl_tests.cpp
+3 -1
View File
@@ -27,6 +27,8 @@
#include <unknwn.h>
#include <GL/gl.h>
#include "util/os_misc.h"
#undef GetMessage
class window
@@ -71,7 +73,7 @@ window::window(uint32_t width, uint32_t height)
_hdc = ::GetDC(_window);
putenv("D3D12_DEBUG=singleton,debuglayer");
os_set_option("D3D12_DEBUG", "singleton,debuglayer", true);
PIXELFORMATDESCRIPTOR pfd = {
sizeof(PIXELFORMATDESCRIPTOR), /* size */
src/util/tests/perf/u_trace_test.cpp
+2 -2
View File
@@ -4,6 +4,7 @@
#include "c11/threads.h"
#include "util/perf/u_trace.h"
#include "util/os_misc.h"
#define NUM_DEBUG_TEST_THREAD 8
@@ -20,9 +21,8 @@ test_thread(void *_state)
TEST(UtilPerfTraceTest, Multithread)
{
static char env_tracefile[] = "MESA_GPU_TRACEFILE=tracefile_for_test-b5ba5a0c-6ed1-4901-a38d-755991182663";
thrd_t threads[NUM_DEBUG_TEST_THREAD];
putenv(env_tracefile);
os_set_option("MESA_GPU_TRACEFILE", "tracefile_for_test-b5ba5a0c-6ed1-4901-a38d-755991182663", true);
for (unsigned i = 0; i < NUM_DEBUG_TEST_THREAD; i++) {
thrd_create(&threads[i], test_thread, NULL);
}
src/util/tests/u_debug_test.cpp
+23 -47
View File
@@ -28,6 +28,8 @@
#include <gtest/gtest.h>
#include "c11/threads.h"
#include "util/os_misc.h"
#include "util/u_debug.h"
#define NUM_DEBUG_TEST_THREAD 8
@@ -44,15 +46,8 @@ test_thread(void *_state)
TEST(u_debug, DEBUG_GET_ONCE_BOOL_Multithread)
{
{
static char env_str[] = "X_TEST_ENV_BOOL=true";
putenv(env_str);
}
{
static char env_str[] = "X_TEST_GALLIUM_DRIVER=test_driver";
putenv(env_str);
}
os_set_option("X_TEST_ENV_BOOL", "true", true);
os_set_option("X_TEST_GALLIUM_DRIVER", "test_driver", true);
thrd_t threads[NUM_DEBUG_TEST_THREAD];
for (unsigned i = 0; i < NUM_DEBUG_TEST_THREAD; i++) {
@@ -69,92 +64,79 @@ TEST(u_debug, DEBUG_GET_ONCE_BOOL_Multithread)
TEST(u_debug, debug_get_bool_option)
{
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_0=10";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_0", "10", true);
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_0", true));
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_0", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_1";
putenv(env_str);
os_unset_option("MESA_UNIT_TEST_BOOL_VARIABLE_1");
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_1", true));
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_1", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_2=INVALID";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_2", "INVALID", true);
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_2", true));
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_2", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_3=0";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_3", "0", true);
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_3", true));
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_3", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_4=n";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_4", "n", true);
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_4", true));
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_4", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_5=No";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_5", "No", true);
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_5", true));
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_5", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_6=F";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_6", "F", true);
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_6", true));
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_6", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_7=fAlse";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_7", "fAlse", true);
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_7", true));
EXPECT_FALSE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_7", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_8=1";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_8", "1", true);
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_8", true));
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_8", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_9=Y";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_9", "Y", true);
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_9", true));
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_9", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_10=Yes";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_10", "Yes", true);
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_10", true));
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_10", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_11=t";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_11", "t", true);
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_11", true));
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_11", false));
}
{
static char env_str[] = "MESA_UNIT_TEST_BOOL_VARIABLE_12=True";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_BOOL_VARIABLE_12", "True", true);
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_12", true));
EXPECT_TRUE(debug_get_bool_option("MESA_UNIT_TEST_BOOL_VARIABLE_12", false));
}
@@ -163,22 +145,19 @@ TEST(u_debug, debug_get_bool_option)
TEST(u_debug, debug_get_num_option)
{
{
static char env_str[] = "MESA_UNIT_TEST_NUM_VARIABLE_0=101";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_NUM_VARIABLE_0", "101", true);
EXPECT_EQ(debug_get_num_option("MESA_UNIT_TEST_NUM_VARIABLE_0", 10), 101);
EXPECT_EQ(debug_get_num_option("MESA_UNIT_TEST_NUM_VARIABLE_0", 0), 101);
}
{
static char env_str[] = "MESA_UNIT_TEST_NUM_VARIABLE_1";
putenv(env_str);
os_unset_option("MESA_UNIT_TEST_NUM_VARIABLE_1");
EXPECT_EQ(debug_get_num_option("MESA_UNIT_TEST_NUM_VARIABLE_1", 10), 10);
EXPECT_EQ(debug_get_num_option("MESA_UNIT_TEST_NUM_VARIABLE_1", 100), 100);
}
{
static char env_str[] = "MESA_UNIT_TEST_NUM_VARIABLE_2=something";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_NUM_VARIABLE_2", "something", true);
EXPECT_EQ(debug_get_num_option("MESA_UNIT_TEST_NUM_VARIABLE_2", 10), 10);
EXPECT_EQ(debug_get_num_option("MESA_UNIT_TEST_NUM_VARIABLE_2", 100), 100);
}
@@ -197,20 +176,17 @@ TEST(u_debug, DEBUG_GET_ONCE_NUM_OPTION_Macro)
}
{
static char env_str[] = "MESA_UNIT_TEST_DEBUG_GET_ONCE_NUM_VARIABLE_1=9223372036854775807";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_DEBUG_GET_ONCE_NUM_VARIABLE_1", "9223372036854775807", true);
EXPECT_EQ(debug_get_option_num_once_test_1(), INT64_MAX);
}
{
static char env_str[] = "MESA_UNIT_TEST_DEBUG_GET_ONCE_NUM_VARIABLE_1=9223372036854775806";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_DEBUG_GET_ONCE_NUM_VARIABLE_1", "9223372036854775806", true);
EXPECT_EQ(debug_get_option_num_once_test_1(), INT64_MAX);
}
{
static char env_str[] = "MESA_UNIT_TEST_DEBUG_GET_ONCE_NUM_VARIABLE_2=-9223372036854775808";
putenv(env_str);
os_set_option("MESA_UNIT_TEST_DEBUG_GET_ONCE_NUM_VARIABLE_2", "-9223372036854775808", true);
EXPECT_EQ(debug_get_option_num_once_test_2(), INT64_MIN);
}
}
src/util/tests/xmlconfig.cpp
+1 -1
View File
@@ -288,7 +288,7 @@ TEST_F(xmlconfig_test, drirc_exec_regexp)
TEST_F(xmlconfig_test, drirc_exec_override)
{
putenv("MESA_DRICONF_EXECUTABLE_OVERRIDE=app1");
os_set_option("MESA_DRICONF_EXECUTABLE_OVERRIDE", "app1", true);
driOptionCache cache = drirc_init("driver", "drm",
NULL,
NULL, 0,