Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3db102a

Browse files
committed
Update test_toolchain_verify.cpp
1 parentb0eff94 commit3db102a

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎buildcc/lib/toolchain/test/test_toolchain_verify.cpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -286,38 +286,6 @@ TEST(ToolchainVerifyTestGroup, VerifyToolchain_Undefined_AddVerificationFunc) {
286286
"undefined_verification_func")));
287287
}
288288

289-
TEST(ToolchainVerifyTestGroup,
290-
VerifyToolchain_Msvc_CompilerVersionAndTargetArchFailure) {
291-
buildcc::Toolchainmsvc(buildcc::ToolchainId::Msvc,"msvc","cl","cl","cl",
292-
"lib","link");
293-
// Setup ENV
294-
// VSCMD_VER
295-
// std::string vscmd_ver = std::string("VSCMD_VER=version");
296-
// // VSCMD_ARG_HOST_ARCH
297-
// std::string host_arch = std::string("VSCMD_ARG_HOST_ARCH=host_arch");
298-
// // VSCMD_ARG_TGT_ARCH
299-
// std::string tgt_arch = std::string("VSCMD_ARG_TGT_ARCH=tgt_arch");
300-
301-
// CHECK_TRUE(putenv(vscmd_ver.data()) == 0);
302-
// CHECK_TRUE(putenv(host_arch.data()) == 0);
303-
// CHECK_TRUE(putenv(tgt_arch.data()) == 0);
304-
305-
// MSVC Compiler
306-
std::string putenv_str =
307-
fmt::format("CUSTOM_BUILDCC_PATH={}/toolchains/msvc",fs::current_path());
308-
int put =putenv(putenv_str.data());
309-
CHECK_TRUE(put ==0);
310-
constchar *custom_buildcc_path =getenv("CUSTOM_BUILDCC_PATH");
311-
CHECK_TRUE(custom_buildcc_path !=nullptr);
312-
UT_PRINT(custom_buildcc_path);
313-
314-
buildcc::ToolchainVerifyConfig config;
315-
config.env_vars.clear();
316-
config.env_vars.insert("CUSTOM_BUILDCC_PATH");
317-
318-
CHECK_THROWS(std::exception, msvc.Verify(config));
319-
}
320-
321289
TEST(ToolchainVerifyTestGroup, VerifyToolchain_BadCompilerId) {
322290
buildcc::Toolchaingcc((buildcc::ToolchainId)65535,"gcc","as","gcc","g++",
323291
"ar","ld");
@@ -361,6 +329,38 @@ TEST(ToolchainVerifyTestGroup, VerifyToolchain_PathContainsDir) {
361329

362330
#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__MINGW64__)
363331

332+
TEST(ToolchainVerifyTestGroup,
333+
VerifyToolchain_Msvc_CompilerVersionAndTargetArchFailure) {
334+
buildcc::Toolchainmsvc(buildcc::ToolchainId::Msvc,"msvc","cl","cl","cl",
335+
"lib","link");
336+
// Setup ENV
337+
// VSCMD_VER
338+
// std::string vscmd_ver = std::string("VSCMD_VER=version");
339+
// // VSCMD_ARG_HOST_ARCH
340+
// std::string host_arch = std::string("VSCMD_ARG_HOST_ARCH=host_arch");
341+
// // VSCMD_ARG_TGT_ARCH
342+
// std::string tgt_arch = std::string("VSCMD_ARG_TGT_ARCH=tgt_arch");
343+
344+
// CHECK_TRUE(putenv(vscmd_ver.data()) == 0);
345+
// CHECK_TRUE(putenv(host_arch.data()) == 0);
346+
// CHECK_TRUE(putenv(tgt_arch.data()) == 0);
347+
348+
// MSVC Compiler
349+
std::string putenv_str =
350+
fmt::format("CUSTOM_BUILDCC_PATH={}/toolchains/msvc",fs::current_path());
351+
int put =putenv(putenv_str.data());
352+
CHECK_TRUE(put ==0);
353+
constchar *custom_buildcc_path =getenv("CUSTOM_BUILDCC_PATH");
354+
CHECK_TRUE(custom_buildcc_path !=nullptr);
355+
UT_PRINT(custom_buildcc_path);
356+
357+
buildcc::ToolchainVerifyConfig config;
358+
config.env_vars.clear();
359+
config.env_vars.insert("CUSTOM_BUILDCC_PATH");
360+
361+
CHECK_THROWS(std::exception, msvc.Verify(config));
362+
}
363+
364364
TEST(ToolchainVerifyTestGroup, VerifyToolchain_LockedFolder) {
365365
std::error_code err;
366366
fs::permissions(fs::current_path() /"toolchains" /"gcc", fs::perms::none,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp