|
65 | 65 | "relative", |
66 | 66 | "${workspaceRoot}/_bld/debug" |
67 | 67 | ] |
| 68 | + }, |
| 69 | + "windows": { |
| 70 | + "problemMatcher": { |
| 71 | + "base": "$msCompile", |
| 72 | + "fileLocation": [ |
| 73 | + "relative", |
| 74 | + "${workspaceRoot}/_bld/debug" |
| 75 | + ] |
| 76 | + } |
68 | 77 | } |
69 | 78 | }, |
70 | 79 | { |
|
81 | 90 | "relative", |
82 | 91 | "${workspaceRoot}/_bld/debug" |
83 | 92 | ] |
| 93 | + }, |
| 94 | + "windows": { |
| 95 | + "problemMatcher": { |
| 96 | + "base": "$msCompile", |
| 97 | + "fileLocation": [ |
| 98 | + "relative", |
| 99 | + "${workspaceRoot}/_bld/debug" |
| 100 | + ] |
| 101 | + } |
84 | 102 | } |
85 | 103 | }, |
86 | 104 | { |
|
97 | 115 | "relative", |
98 | 116 | "${workspaceRoot}/_bld/release" |
99 | 117 | ] |
| 118 | + }, |
| 119 | + "windows": { |
| 120 | + "problemMatcher": { |
| 121 | + "base": "$msCompile", |
| 122 | + "fileLocation": [ |
| 123 | + "relative", |
| 124 | + "${workspaceRoot}/_bld/release" |
| 125 | + ] |
| 126 | + } |
100 | 127 | } |
101 | 128 | }, |
102 | 129 | { |
|
107 | 134 | "Generate leaf.hpp" |
108 | 135 | ], |
109 | 136 | "command": "../../b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header,leaf_debug_embedded,leaf_release_embedded exception-handling=off rtti=off cxxstd=11,14,1z,17 && ../../b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header exception-handling=on,off cxxstd=11,14,1z,17", |
110 | | - "windows": { |
111 | | - "command": "..\\..\\b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header,leaf_debug_embedded,leaf_release_embedded exception-handling=off rtti=off cxxstd=14,17,latest && ..\\..\\b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header exception-handling=on,off cxxstd=14,17,latest", |
112 | | - }, |
113 | 137 | "problemMatcher": { |
114 | 138 | "base": "$gcc", |
115 | 139 | "fileLocation": [ |
116 | 140 | "relative", |
117 | 141 | "${workspaceRoot}/_bld/release" |
118 | 142 | ] |
| 143 | + }, |
| 144 | + "windows": { |
| 145 | + "command": "..\\..\\b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header,leaf_debug_embedded,leaf_release_embedded exception-handling=off rtti=off cxxstd=14,17,latest && ..\\..\\b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header exception-handling=on,off cxxstd=14,17,latest", |
| 146 | + "problemMatcher": { |
| 147 | + "base": "$msCompile", |
| 148 | + "fileLocation": [ |
| 149 | + "relative", |
| 150 | + "${workspaceRoot}/_bld/release" |
| 151 | + ] |
| 152 | + } |
119 | 153 | } |
120 | 154 | }, |
121 | 155 | { |
|
125 | 159 | }, |
126 | 160 | "label": "Test current editor file", |
127 | 161 | "type": "shell", |
128 | | - "command": "cd ${workspaceRoot}/_bld/debug && ninja && {meson test ${fileBasenameNoExtension} || cat ./meson-logs/testlog.txt}", |
| 162 | +<<<<<<< Updated upstream |
| 163 | + "command": "cd ${workspaceRoot}/_bld/debug && ninja && { meson test ${fileBasenameNoExtension} || cat ./meson-logs/testlog.txt; }",, |
129 | 164 | "windows": { |
130 | | - "command": "cd ${workspaceRoot}/_bld/debug && ninja && (meson test ${fileBasenameNoExtension} || cat ./meson-logs/testlog.txt)", |
| 165 | + "command": "cd ${workspaceRoot}/_bld/debug && ninja && (meson test ${fileBasenameNoExtension} || type .\\meson-logs\\testlog.txt)", |
131 | 166 | }, |
| 167 | +======= |
| 168 | + "command": "cd ${workspaceRoot}/_bld/debug && ninja && {meson test ${fileBasenameNoExtension} || cat ./meson-logs/testlog.txt}", |
| 169 | +>>>>>>> Stashed changes |
132 | 170 | "problemMatcher": { |
133 | 171 | "base": "$gcc", |
134 | 172 | "fileLocation": [ |
135 | 173 | "relative", |
136 | 174 | "${workspaceRoot}/_bld/debug" |
137 | 175 | ] |
| 176 | + }, |
| 177 | + "windows": { |
| 178 | + "command": "cd ${workspaceRoot}/_bld/debug && ninja && (meson test ${fileBasenameNoExtension} || type .\\meson-logs\\testlog.txt)", |
| 179 | + "problemMatcher": { |
| 180 | + "base": "$msCompile", |
| 181 | + "fileLocation": [ |
| 182 | + "relative", |
| 183 | + "${workspaceRoot}/_bld/debug" |
| 184 | + ] |
| 185 | + } |
138 | 186 | } |
139 | 187 | } |
140 | 188 | ] |
|
0 commit comments