Skip to content

Commit ff8980e

Browse files
Neko-Box-CoderNeko-Box-Coder
committed
MSVC fix
1 parent d903162 commit ff8980e

File tree

2 files changed

+144
-144
lines changed

2 files changed

+144
-144
lines changed

‎Src/Tests/Data/ProfileTest.cpp‎

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -12,115 +12,115 @@ int main(int argc, char** argv)
1212

1313
ssTEST("Profile Should Parse Valid YAML")
1414
{
15+
const char* yamlStr = R"(
16+
Name: "g++"
17+
NameAliases: ["mingw"]
18+
FileExtensions: [.cpp, .cc, .cxx]
19+
Languages: ["c++"]
20+
Setup:
21+
Default: ["setup command 1", "setup command 2"]
22+
Cleanup:
23+
Default: []
24+
FilesTypes:
25+
ObjectLinkFile:
26+
Prefix:
27+
Default: ""
28+
Extension:
29+
Windows: ".obj"
30+
Unix: ".o"
31+
SharedLinkFile:
32+
Prefix:
33+
Windows: ""
34+
Linux: "lib"
35+
MacOS: ""
36+
Extension:
37+
Windows: ".lib"
38+
Linux: ".so"
39+
MacOS: ".dylib"
40+
SharedLibraryFile:
41+
Prefix:
42+
Windows: ""
43+
Linux: "lib"
44+
MacOS: ""
45+
Extension:
46+
Windows: ".dll"
47+
Linux: ".so"
48+
MacOS: ".dylib"
49+
StaticLinkFile:
50+
Prefix:
51+
Unix: "lib"
52+
Windows: ""
53+
Extension:
54+
Windows: ".lib"
55+
Unix: ".a"
56+
Compiler:
57+
PreRun:
58+
Default: ""
59+
CheckExistence:
60+
Default: "g++ -v"
61+
CompileTypes:
62+
Executable:
63+
Default:
64+
Flags: "-std=c++17 -Wall -g"
65+
Executable: "g++"
66+
RunParts:
67+
- Type: Once
68+
CommandPart: "{Executable} -c {CompileFlags}"
69+
- Type: Repeats
70+
CommandPart: " -I\"{IncludeDirectoryPath}\""
71+
- Type: Once
72+
CommandPart: " \"{InputFilePath}\" -o \"{OutputFilePath}\""
73+
Static:
74+
Default:
75+
Flags: "-std=c++17 -Wall -g"
76+
Executable: "g++"
77+
RunParts:
78+
- Type: Once
79+
CommandPart: "{Executable} -c {CompileFlags}"
80+
Shared:
81+
Default:
82+
Flags: "-std=c++17 -Wall -g -fpic"
83+
Executable: "g++"
84+
RunParts:
85+
- Type: Once
86+
CommandPart: "{Executable} -c {CompileFlags}"
87+
Linker:
88+
PreRun:
89+
Default: ""
90+
CheckExistence:
91+
Default: "g++ -v"
92+
LinkTypes:
93+
Executable:
94+
Unix:
95+
Flags: "-Wl,-rpath,\\$ORIGIN"
96+
Executable: "g++"
97+
RunParts:
98+
- Type: Once
99+
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
100+
Windows:
101+
Flags: "-Wl,-rpath,\\$ORIGIN"
102+
Executable: "g++"
103+
RunParts:
104+
- Type: Once
105+
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
106+
Static:
107+
Default:
108+
Flags: ""
109+
Executable: "g++"
110+
RunParts:
111+
- Type: Once
112+
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
113+
Shared:
114+
Unix:
115+
Flags: "-shared -Wl,-rpath,\\$ORIGIN"
116+
Executable: "g++"
117+
RunParts:
118+
- Type: Once
119+
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
120+
)";
121+
15122
ssTEST_OUTPUT_SETUP
16123
(
17-
const char* yamlStr = R"(
18-
Name: "g++"
19-
NameAliases: ["mingw"]
20-
FileExtensions: [.cpp, .cc, .cxx]
21-
Languages: ["c++"]
22-
Setup:
23-
Default: ["setup command 1", "setup command 2"]
24-
Cleanup:
25-
Default: []
26-
FilesTypes:
27-
ObjectLinkFile:
28-
Prefix:
29-
Default: ""
30-
Extension:
31-
Windows: ".obj"
32-
Unix: ".o"
33-
SharedLinkFile:
34-
Prefix:
35-
Windows: ""
36-
Linux: "lib"
37-
MacOS: ""
38-
Extension:
39-
Windows: ".lib"
40-
Linux: ".so"
41-
MacOS: ".dylib"
42-
SharedLibraryFile:
43-
Prefix:
44-
Windows: ""
45-
Linux: "lib"
46-
MacOS: ""
47-
Extension:
48-
Windows: ".dll"
49-
Linux: ".so"
50-
MacOS: ".dylib"
51-
StaticLinkFile:
52-
Prefix:
53-
Unix: "lib"
54-
Windows: ""
55-
Extension:
56-
Windows: ".lib"
57-
Unix: ".a"
58-
Compiler:
59-
PreRun:
60-
Default: ""
61-
CheckExistence:
62-
Default: "g++ -v"
63-
CompileTypes:
64-
Executable:
65-
Default:
66-
Flags: "-std=c++17 -Wall -g"
67-
Executable: "g++"
68-
RunParts:
69-
- Type: Once
70-
CommandPart: "{Executable} -c {CompileFlags}"
71-
- Type: Repeats
72-
CommandPart: " -I\"{IncludeDirectoryPath}\""
73-
- Type: Once
74-
CommandPart: " \"{InputFilePath}\" -o \"{OutputFilePath}\""
75-
Static:
76-
Default:
77-
Flags: "-std=c++17 -Wall -g"
78-
Executable: "g++"
79-
RunParts:
80-
- Type: Once
81-
CommandPart: "{Executable} -c {CompileFlags}"
82-
Shared:
83-
Default:
84-
Flags: "-std=c++17 -Wall -g -fpic"
85-
Executable: "g++"
86-
RunParts:
87-
- Type: Once
88-
CommandPart: "{Executable} -c {CompileFlags}"
89-
Linker:
90-
PreRun:
91-
Default: ""
92-
CheckExistence:
93-
Default: "g++ -v"
94-
LinkTypes:
95-
Executable:
96-
Unix:
97-
Flags: "-Wl,-rpath,\\$ORIGIN"
98-
Executable: "g++"
99-
RunParts:
100-
- Type: Once
101-
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
102-
Windows:
103-
Flags: "-Wl,-rpath,\\$ORIGIN"
104-
Executable: "g++"
105-
RunParts:
106-
- Type: Once
107-
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
108-
Static:
109-
Default:
110-
Flags: ""
111-
Executable: "g++"
112-
RunParts:
113-
- Type: Once
114-
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
115-
Shared:
116-
Unix:
117-
Flags: "-shared -Wl,-rpath,\\$ORIGIN"
118-
Executable: "g++"
119-
RunParts:
120-
- Type: Once
121-
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
122-
)";
123-
124124
ryml::Tree tree = ryml::parse_in_arena(c4::to_csubstr(yamlStr));
125125
ryml::ConstNodeRef root = tree.rootref();
126126

‎Src/Tests/Data/StageInfoTest.cpp‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,45 @@ int main(int argc, char** argv)
1212

1313
ssTEST("StageInfo Should Parse Valid YAML")
1414
{
15+
const char* yamlStr = R"(
16+
PreRun:
17+
GCC: source env.sh
18+
CheckExistence:
19+
GCC: which gcc
20+
LinkTypes:
21+
Executable:
22+
Unix:
23+
Flags: "-Wl,-rpath,\\$ORIGIN"
24+
Executable: "g++"
25+
Setup: ["mkdir build"]
26+
Cleanup: ["rm -rf build"]
27+
RunParts:
28+
- Type: Once
29+
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
30+
- Type: Repeats
31+
CommandPart: " \"{LinkFilePath}\""
32+
Static:
33+
Unix:
34+
Flags: "-Wl,-rpath,\\$ORIGIN"
35+
Executable: "g++"
36+
RunParts:
37+
- Type: Once
38+
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
39+
- Type: Repeats
40+
CommandPart: " \"{LinkFilePath}\""
41+
Shared:
42+
Unix:
43+
Flags: "-Wl,-rpath,\\$ORIGIN"
44+
Executable: "g++"
45+
RunParts:
46+
- Type: Once
47+
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
48+
- Type: Repeats
49+
CommandPart: " \"{LinkFilePath}\""
50+
)";
51+
1552
ssTEST_OUTPUT_SETUP
1653
(
17-
const char* yamlStr = R"(
18-
PreRun:
19-
GCC: source env.sh
20-
CheckExistence:
21-
GCC: which gcc
22-
LinkTypes:
23-
Executable:
24-
Unix:
25-
Flags: "-Wl,-rpath,\\$ORIGIN"
26-
Executable: "g++"
27-
Setup: ["mkdir build"]
28-
Cleanup: ["rm -rf build"]
29-
RunParts:
30-
- Type: Once
31-
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
32-
- Type: Repeats
33-
CommandPart: " \"{LinkFilePath}\""
34-
Static:
35-
Unix:
36-
Flags: "-Wl,-rpath,\\$ORIGIN"
37-
Executable: "g++"
38-
RunParts:
39-
- Type: Once
40-
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
41-
- Type: Repeats
42-
CommandPart: " \"{LinkFilePath}\""
43-
Shared:
44-
Unix:
45-
Flags: "-Wl,-rpath,\\$ORIGIN"
46-
Executable: "g++"
47-
RunParts:
48-
- Type: Once
49-
CommandPart: "{Executable} {LinkFlags} -o \"{OutputFilePath}\""
50-
- Type: Repeats
51-
CommandPart: " \"{LinkFilePath}\""
52-
)";
53-
5454
ryml::Tree tree = ryml::parse_in_arena(c4::to_csubstr(yamlStr));
5555
ryml::ConstNodeRef root = tree.rootref();
5656

0 commit comments

Comments
 (0)