microsoft
/
vscode-makefile-tools
зеркало из https://github.com/microsoft/vscode-makefile-tools.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Follow up fixes for consistent diffs accross different makefile-tools repos

This commit is contained in:
Andreea Isac 2020-03-19 15:23:08 -07:00
Родитель 6bafde1deb
Коммит f1ddbd659c
8 изменённых файлов: 1734 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/cpptools.ts
Просмотреть файл

@ -87,7 +87,7 @@ export class CppConfigurationProvider implements cpp.CustomConfigurationProvider
// of all the compiler invocations of the current configuration
filesPaths.forEach(filePath => {
this.fileIndex.set(path.normalize(filePath), {
uri: vscode.Uri.file(filePath).toString(),
uri: filePath,
configuration,
});

9
src/parser.ts
Просмотреть файл

@ -67,6 +67,15 @@ export function parseTargets(verboseLog: string): string[] {
function preprocessDryRunOutput(dryRunOutputStr: string): string {
let preprocessedDryRunOutputStr: string = dryRunOutputStr;
// Expand {REPO:VSCODE-MAKEFILE-TOOLS} to the full path of the root of the extension
// This is used for the pre-created dry-run logs consumed by the tests,
// in order to be able to have source files and includes for the test repro
// within the test subfolder of the extension repo, while still exercising full paths for parsing
// and not generating a different output with every new location where Makefile Tools is enlisted.
// A real user scenario wouldn't need this construct.
let extensionRootPath: string = path.resolve(__dirname, "../../");
preprocessedDryRunOutputStr = preprocessedDryRunOutputStr.replace(/{REPO:VSCODE-MAKEFILE-TOOLS}/mg, extensionRootPath);
// Split multiple commands concatenated by '&&' or by ";"
preprocessedDryRunOutputStr = preprocessedDryRunOutputStr.replace(/ && /g, "\n");
preprocessedDryRunOutputStr = preprocessedDryRunOutputStr.replace(/;/g, "\n");

18
src/test/fakeSuite/Repros/InterestingSmallMakefile_windows_baseline.out
Просмотреть файл

@ -25,7 +25,7 @@ Sending Workspace Browse Configuration: -----------------------------------
Standard: c++17
Compiler Path: cl.exe
----------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/main.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\main.cpp -----------------------------------
Defines: MyDefine;Debug;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\inc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\in c1;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:
@ -33,7 +33,7 @@ Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/tes
IntelliSense Mode: msvc-x64
Compiler Path: cl.exe
---------------------------------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/test1.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\test1.cpp -----------------------------------
Defines: MyDefine;Debug;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\inc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\in c1;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:
@ -41,7 +41,7 @@ Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/tes
IntelliSense Mode: msvc-x64
Compiler Path: cl.exe
---------------------------------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/test2.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\test2.cpp -----------------------------------
Defines: MyDefine2;Debug;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:
@ -60,7 +60,7 @@ Sending Workspace Browse Configuration: -----------------------------------
Standard: c++17
Compiler Path: cl.exe
----------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/main.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\main.cpp -----------------------------------
Defines: MyDefine;Debug;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\inc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\in c1;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:
@ -68,7 +68,7 @@ Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/tes
IntelliSense Mode: msvc-x64
Compiler Path: cl.exe
---------------------------------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/test1.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\test1.cpp -----------------------------------
Defines: MyDefine;Debug;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\inc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\in c1;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:
@ -76,7 +76,7 @@ Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/tes
IntelliSense Mode: msvc-x64
Compiler Path: cl.exe
---------------------------------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/test2.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\test2.cpp -----------------------------------
Defines: MyDefine2;Debug;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:
@ -109,7 +109,7 @@ Sending Workspace Browse Configuration: -----------------------------------
Standard: c++17
Compiler Path: cl.exe
----------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/main.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\main.cpp -----------------------------------
Defines: MyDefine;RelSize;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\inc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\in c1;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:
@ -117,7 +117,7 @@ Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/tes
IntelliSense Mode: msvc-x64
Compiler Path: cl.exe
---------------------------------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/test1.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\test1.cpp -----------------------------------
Defines: MyDefine;RelSize;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\inc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\in c1;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:
@ -125,7 +125,7 @@ Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/tes
IntelliSense Mode: msvc-x64
Compiler Path: cl.exe
---------------------------------------------------------------------------------------------------
Sending configuration for file file:///c%3A/repos2/vscode-makefile-tools/src/test/fakeSuite/Repros/src/test2.cpp -----------------------------------
Sending configuration for file {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\test2.cpp -----------------------------------
Defines: MyDefine2;RelSize;ARCH=3
Includes: {REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\SubfolderLocalToWorkspace;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src\SubfolderLocalToSrc;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros;{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\Repros\src
Force Includes:

8
src/test/fakeSuite/Repros/InterestingSmallMakefile_windows_dryrunDebug.log
Просмотреть файл

@ -12,7 +12,7 @@ if not exist out mkdir out
if not exist bin\ARCH1\Debug mkdir bin\ARCH1\Debug
if not exist intermediate\ARCH1\Debug mkdir intermediate\ARCH1\Debug
cl .\src\main.cpp .\src\test1.cpp /I..\inc /I "..\in c1" /I"SubfolderLocalToWorkspace" /I "src\SubfolderLocalToSrc" /I. /Isrc /D MyDefine @cl.rsp /DDebug /RTC /Od /Zi /std:c++14 /DARCH=1 /c
cl .\src\test2.cpp -I"c:\repos2\vscode-makefile-tools\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DDebug /RTC /Od /Zi /DARCH=1 /c
cl .\src\test2.cpp -I"{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DDebug /RTC /Od /Zi /DARCH=1 /c
copy main.obj intermediate\ARCH1\Debug
copy test1.obj intermediate\ARCH1\Debug
copy test2.obj intermediate\ARCH1\Debug
@ -21,7 +21,7 @@ link.exe /out:bin\ARCH1\Debug\main.exe intermediate\ARCH1\Debug\main.obj interme
if not exist bin\ARCH2\Debug mkdir bin\ARCH2\Debug
if not exist intermediate\ARCH2\Debug mkdir intermediate\ARCH2\Debug
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx86\x86\cl" .\src\main.cpp .\src\test1.cpp /I..\inc /I "..\in c1" /I"SubfolderLocalToWorkspace" /I "src\SubfolderLocalToSrc" /I. /Isrc /D MyDefine @cl.rsp /DDebug /RTC /Od /Zi /std:c++14 /DARCH=2 /c
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx86\x86\cl.exe" .\src\test2.cpp -I"c:\repos2\vscode-makefile-tools\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DDebug /RTC /Od /Zi /DARCH=2 /c
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx86\x86\cl.exe" .\src\test2.cpp -I"{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DDebug /RTC /Od /Zi /DARCH=2 /c
copy main.obj intermediate\ARCH2\Debug
copy test1.obj intermediate\ARCH2\Debug
copy test2.obj intermediate\ARCH2\Debug
@ -30,7 +30,7 @@ link /out:bin\ARCH2\Debug\main.exe intermediate\ARCH2\Debug\main.obj intermediat
if not exist "bin\ARC H3\Debug" mkdir "bin\ARC H3\Debug"
if not exist "intermediate\ARC H3\Debug" mkdir "intermediate\ARC H3\Debug"
"cl" .\src\main.cpp .\src\test1.cpp /I..\inc /I "..\in c1" /I"SubfolderLocalToWorkspace" /I "src\SubfolderLocalToSrc" /I. /Isrc /D MyDefine @cl.rsp /DDebug /RTC /Od /Zi /std:c++14 /DARCH=3 /c
"cl.exe" .\src\test2.cpp -I"c:\repos2\vscode-makefile-tools\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DDebug /RTC /Od /Zi /DARCH=3 /c
"cl.exe" .\src\test2.cpp -I"{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DDebug /RTC /Od /Zi /DARCH=3 /c
copy main.obj "intermediate\ARC H3\Debug"
copy test1.obj "intermediate\ARC H3\Debug"
copy test2.obj "intermediate\ARC H3\Debug"
@ -168,7 +168,7 @@ LINT = lint
# environment
WindowsLibPath = C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.18362.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.18362.0
# makefile (from `makefile', line 15)
INCLUDES2 = -I"c:\repos2\vscode-makefile-tools\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc
INCLUDES2 = -I"{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc
# default
LINT.c = $(LINT) $(LINTFLAGS) $(CPPFLAGS) $(TARGET_ARCH)
# environment

8
src/test/fakeSuite/Repros/InterestingSmallMakefile_windows_dryrunRelSize.log
Просмотреть файл

@ -12,7 +12,7 @@ if not exist out mkdir out
if not exist bin\ARCH1\RelSize mkdir bin\ARCH1\RelSize
if not exist intermediate\ARCH1\RelSize mkdir intermediate\ARCH1\RelSize
cl .\src\main.cpp .\src\test1.cpp /I..\inc /I "..\in c1" /I"SubfolderLocalToWorkspace" /I "src\SubfolderLocalToSrc" /I. /Isrc /D MyDefine @cl.rsp /DRelSize /O1 /std:c++14 /DARCH=1 /c
cl .\src\test2.cpp -I"c:\repos2\vscode-makefile-tools\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DRelSize /O1 /DARCH=1 /c
cl .\src\test2.cpp -I"{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DRelSize /O1 /DARCH=1 /c
copy main.obj intermediate\ARCH1\RelSize
copy test1.obj intermediate\ARCH1\RelSize
copy test2.obj intermediate\ARCH1\RelSize
@ -21,7 +21,7 @@ link.exe /out:bin\ARCH1\RelSize\main.exe intermediate\ARCH1\RelSize\main.obj int
if not exist bin\ARCH2\RelSize mkdir bin\ARCH2\RelSize
if not exist intermediate\ARCH2\RelSize mkdir intermediate\ARCH2\RelSize
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx86\x86\cl" .\src\main.cpp .\src\test1.cpp /I..\inc /I "..\in c1" /I"SubfolderLocalToWorkspace" /I "src\SubfolderLocalToSrc" /I. /Isrc /D MyDefine @cl.rsp /DRelSize /O1 /std:c++14 /DARCH=2 /c
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx86\x86\cl.exe" .\src\test2.cpp -I"c:\repos2\vscode-makefile-tools\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DRelSize /O1 /DARCH=2 /c
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx86\x86\cl.exe" .\src\test2.cpp -I"{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DRelSize /O1 /DARCH=2 /c
copy main.obj intermediate\ARCH2\RelSize
copy test1.obj intermediate\ARCH2\RelSize
copy test2.obj intermediate\ARCH2\RelSize
@ -30,7 +30,7 @@ link /out:bin\ARCH2\RelSize\main.exe intermediate\ARCH2\RelSize\main.obj interme
if not exist "bin\ARC H3\RelSize" mkdir "bin\ARC H3\RelSize"
if not exist "intermediate\ARC H3\RelSize" mkdir "intermediate\ARC H3\RelSize"
"cl" .\src\main.cpp .\src\test1.cpp /I..\inc /I "..\in c1" /I"SubfolderLocalToWorkspace" /I "src\SubfolderLocalToSrc" /I. /Isrc /D MyDefine @cl.rsp /DRelSize /O1 /std:c++14 /DARCH=3 /c
"cl.exe" .\src\test2.cpp -I"c:\repos2\vscode-makefile-tools\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DRelSize /O1 /DARCH=3 /c
"cl.exe" .\src\test2.cpp -I"{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc /DMyDefine2 /DRelSize /O1 /DARCH=3 /c
copy main.obj "intermediate\ARC H3\RelSize"
copy test1.obj "intermediate\ARC H3\RelSize"
copy test2.obj "intermediate\ARC H3\RelSize"
@ -168,7 +168,7 @@ LINT = lint
# environment
WindowsLibPath = C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.18362.0;C:\Program Files (x86)\Windows Kits\10\References\10.0.18362.0
# makefile (from `makefile', line 15)
INCLUDES2 = -I"c:\repos2\vscode-makefile-tools\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc
INCLUDES2 = -I"{REPO:VSCODE-MAKEFILE-TOOLS}\src\test\fakeSuite\repros\Small_Interesting_Makefile\inc2" -I"SubfolderLocalToWorkspace" -I "src\SubfolderLocalToSrc" /I. /Isrc
# default
LINT.c = $(LINT) $(LINTFLAGS) $(CPPFLAGS) $(TARGET_ARCH)
# environment

1677
src/test/fakeSuite/Repros/InterestingSmallMakefile_windows_dryrunRelSpeed.log Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

5
src/test/fakeSuite/extension.test.ts
Просмотреть файл

@ -31,6 +31,7 @@ import * as make from '../../make';
import * as util from '../../util';
import * as path from 'path';
import * as vscode from 'vscode';
import { fstat } from 'fs';
// TODO: refactor initialization and cleanup of each test
suite('Fake dryrun parsing', /*async*/() => {
@ -87,6 +88,10 @@ suite('Fake dryrun parsing', /*async*/() => {
let baselineLogContent: string = util.readFile(baselineLogPath) || "";
let extensionRootPath: string = path.resolve(__dirname, "../../../../");
baselineLogContent = baselineLogContent.replace(/{REPO:VSCODE-MAKEFILE-TOOLS}/mg, extensionRootPath);
// The extension log is printing lines after \r\n were replaced with \n
// (see comments in parser.ts - preprocessDryRunOutput).
// Committing the baseline always puts the \r\n back, so preprocess here before the comparison
baselineLogContent = baselineLogContent.replace("\r\n", "\n");
assert(extensionLogContent === baselineLogContent, "Extension log differs from baseline.");
});
}

26
yarn.lock
Просмотреть файл

@ -18,11 +18,35 @@
esutils "^2.0.2"
js-tokens "^4.0.0"
"@types/events@*":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
"@types/glob@^7.1.1":
version "7.1.1"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
dependencies:
"@types/events" "*"
"@types/minimatch" "*"
"@types/node" "*"
"@types/minimatch@*":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
"@types/mocha@^2.2.42":
version "2.2.48"
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab"
integrity sha512-nlK/iyETgafGli8Zh9zJVCTicvU3iajSkRwOh3Hhiva598CMqNJ4NcVCGMTGKpGpTYj/9R8RLzS9NAykSSCqGw==
"@types/node@*":
version "13.9.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz#ace1880c03594cc3e80206d96847157d8e7fa349"
integrity sha512-bnoqK579sAYrQbp73wwglccjJ4sfRdKU7WNEZ5FW4K2U6Kc0/eZ5kvXG0JKsEKFB50zrFmfFt52/cvBbZa7eXg==
"@types/node@^10.17.17":
version "10.17.17"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.17.tgz#7a183163a9e6ff720d86502db23ba4aade5999b8"
@ -308,7 +332,7 @@ glob@7.1.2:
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@^7.1.1, glob@^7.1.2:
glob@^7.1.1, glob@^7.1.2, glob@^7.1.6:
version "7.1.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==