Skip to content

Commit 1efb87b

Browse files
bobbrowbobbrow
authored
Merge pull request #1093 from microsoft/develop
1.3.1 merge develop -> master
2 parents dc6c6b2 + 7118eb4 commit 1efb87b

29 files changed

+96
-34
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# What's New?
22

3+
## 1.3.1
4+
Improvements:
5+
- Show "Collapse all" command on project outline view. [#839](https://github.com/microsoft/vscode-cmake-tools/issues/839) [@dirondin](https://github.com/dirondin)
6+
7+
Bug Fixes:
8+
- Toolset and platform are swapped when reading from CMake cache. [#1065](https://github.com/microsoft/vscode-cmake-tools/issues/1065)
9+
- Unable to debug targets when path is specified as absolute by the cmake-file-api. [#1067](https://github.com/microsoft/vscode-cmake-tools/issues/1067) [@KoeMai](https://github.com/KoeMai)
10+
311
## 1.3.0
412
Improvements:
513
- Multi-root support. You can now open multiple folders in VS Code and CMake Tools will allow you to configure each of the projects in those folders.

‎i18n/chs/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "在文件夹 \"{0}\" 的根中找不到 CMakeLists.txt",
1818
"starting.cmake.driver": "正在启动 CMake 驱动程序",
1919
"bad.cmake.executable": "CMake 可执行文件“{0}”不正确。",
20+
"switch.to.serverapi": "在低于 {0} 的版本中不支持 CMake 文件-API 通信模式。正在切换到 CMake 服务器通信模式。",
2021
"please.upgrade.cmake": "为获得最佳体验，必须具备 CMake 服务器或 file-api 支持。请将 CMake 升级到 {0} 或更高版本。",
2122
"starting.cmake.driver.status": "正在启动 CMake 服务器...",
2223
"ready.status": "就绪",

‎i18n/cht/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "在資料夾 '{0}' 的根中，找不到 CMakeLists.txt",
1818
"starting.cmake.driver": "正在啟動 CMake 驅動程式",
1919
"bad.cmake.executable": "錯誤的 CMake 可執行檔 \"{0}\"。",
20+
"switch.to.serverapi": "{0} 之前的版本，不支援 CMake 的檔案對 api 通訊模式。正在切換到 CMake 伺服器通訊模式。",
2021
"please.upgrade.cmake": "為達到最佳體驗，需有 CMake 伺服器或檔案 api 支援。請將 CMake 升級為 {0} 或更新版本。",
2122
"starting.cmake.driver.status": "正在啟動 CMake 伺服器...",
2223
"ready.status": "就緒",

‎i18n/csy/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "V kořenu složky {0} se nenašel soubor CMakeLists.txt.",
1818
"starting.cmake.driver": "Spouští se ovladač CMake.",
1919
"bad.cmake.executable": "Nesprávný spustitelný soubor nástrojů CMake {0}",
20+
"switch.to.serverapi": "Režim komunikace pomocí rozhraní API souborů CMake se ve verzích starších než {0} nepodporuje. Přepíná se na režim komunikace pomocí serveru CMake.",
2021
"please.upgrade.cmake": "Aby vaše prostředí bylo co nejlepší, vyžaduje se podpora serveru CMake nebo file-api. Upgradujte prosím CMake na verzi {0} nebo novější.",
2122
"starting.cmake.driver.status": "Spouští se server CMake...",
2223
"ready.status": "Připraveno",

‎i18n/deu/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "\"CMakeLists.txt\" wurde im Stamm des Ordners \"{0}\" nicht gefunden.",
1818
"starting.cmake.driver": "CMake-Treiber wird gestartet.",
1919
"bad.cmake.executable": "Ungültige ausführbare CMake-Datei \"{0}\".",
20+
"switch.to.serverapi": "Der CMake-Kommunikationsmodus \"file-api\" wird in Versionen vor {0} nicht unterstützt. Es wird zum CMake-Serverkommunikationsmodus gewechselt.",
2021
"please.upgrade.cmake": "Für ein optimales Benutzererlebnis ist die Unterstützung von CMake-Server oder file-api erforderlich. Führen Sie ein Upgrade auf CMake {0} oder höher durch.",
2122
"starting.cmake.driver.status": "Der CMake-Server wird gestartet...",
2223
"ready.status": "Bereit",

‎i18n/esn/src/cmake-tools.i18n.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "No se encontró CMakeLists.txt en la raíz de la carpeta \"{0}\".",
1818
"starting.cmake.driver": "Iniciando el controlador de CMake",
1919
"bad.cmake.executable": "El ejecutable de CMake \"{0}\" es incorrecto.",
20+
"switch.to.serverapi": "No se admite el modo de comunicación file-api de CMake en las versiones anteriores a {0}. Cambiando al modo de comunicación del servidor de CMake.",
2021
"please.upgrade.cmake": "Para disfrutar de la mejor experiencia, se requiere compatibilidad con file-api o con el servidor CMake. Actualice CMake a {0} o a una versión más reciente.",
2122
"starting.cmake.driver.status": "Iniciando el servidor de CMake...",
2223
"ready.status": "Listo",
@@ -61,7 +62,7 @@
6162
"run.build": "Compilando la carpeta: {0}",
6263
"unable.to.configure": "Error de compilación: no se puede configurar el proyecto",
6364
"driver.died.after.successful.configure": "El controlador de CMake finalizó de forma inmediata después de que la configuración se realizara correctamente.",
64-
"building.status": "Edificio",
65+
"building.status": "Compilando",
6566
"building.target": "Compilando: {0}",
6667
"stop.on.cancellation": "Detener al cancelar",
6768
"starting.build": "Iniciando la compilación",

‎i18n/fra/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "CMakeLists.txt est introuvable à la racine du dossier '{0}'",
1818
"starting.cmake.driver": "Démarrage du pilote CMake",
1919
"bad.cmake.executable": "Exécutable CMake incorrect \"{0}\".",
20+
"switch.to.serverapi": "Le mode de communication d'API de fichier CMake n'est pas pris en charge dans les versions antérieures à {0}. Passage au mode de communication de serveur CMake.",
2021
"please.upgrade.cmake": "Pour une expérience optimale, la prise en charge du serveur CMake ou de l'API de fichier est nécessaire. Effectuez une mise à niveau de CMake vers la version {0} ou une version plus récente.",
2122
"starting.cmake.driver.status": "Démarrage du serveur CMake...",
2223
"ready.status": "Prêt",

‎i18n/ita/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "CMakeLists.txt non è stato trovato nella radice della cartella '{0}'",
1818
"starting.cmake.driver": "Avvio del driver di CMake",
1919
"bad.cmake.executable": "L'eseguibile di CMake \"{0}\" non è valido.",
20+
"switch.to.serverapi": "La modalità di comunicazione file-api di CMake non è supportata in versioni precedenti alla {0}. Verrà effettuato il passaggio alla modalità di comunicazione server di CMake.",
2021
"please.upgrade.cmake": "Per un'esperienza ottimale è richiesto il supporto di file-api o il server CMake. Aggiornare CMake alla versione {0} o a una versione successiva.",
2122
"starting.cmake.driver.status": "Avvio del server CMake...",
2223
"ready.status": "Pronto",

‎i18n/jpn/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "フォルダー '{0}' のルートに CMakeLists.txt が見つかりませんでした",
1818
"starting.cmake.driver": "CMake ドライバーを開始しています",
1919
"bad.cmake.executable": "CMake 実行可能ファイル \"{0}\" が正しくありません。",
20+
"switch.to.serverapi": "CMake file-api 通信モードは {0} より前のバージョンではサポートされていません。CMake サーバー通信モードに切り替えています。",
2021
"please.upgrade.cmake": "最適なエクスペリエンスを得るためには、CMake サーバーまたは file-api サポートが必要です。CMake を {0} またはそれ以降にアップグレードしてください。",
2122
"starting.cmake.driver.status": "CMake サーバーを開始しています...",
2223
"ready.status": "準備完了",

‎i18n/kor/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "CMakeLists.txt가 '{0}' 폴더의 루트에 없음",
1818
"starting.cmake.driver": "CMake 드라이버를 시작하는 중",
1919
"bad.cmake.executable": "잘못된 CMake 실행 파일 \"{0}\".",
20+
"switch.to.serverapi": "{0} 이전 버전에서는 CMake file-api 통신 모드가 지원되지 않습니다. CMake 서버 통신 모드로 전환하는 중입니다.",
2021
"please.upgrade.cmake": "최상의 환경을 위해 CMake 서버 또는 file-api 지원이 필요합니다. CMake를 {0} 이상으로 업그레이드하세요.",
2122
"starting.cmake.driver.status": "CMake 서버를 시작하는 중...",
2223
"ready.status": "준비",

‎i18n/plk/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "Nie znaleziono pliku CMakeLists.txt w katalogu głównym folderu „{0}”",
1818
"starting.cmake.driver": "Uruchamianie sterownika narzędzia CMake",
1919
"bad.cmake.executable": "Nieprawidłowy plik wykonywalny narzędzia CMake „{0}”.",
20+
"switch.to.serverapi": "Tryb komunikacji interfejsu API pliku narzędzia CMake nie jest obsługiwany w wersjach wcześniejszych niż {0}. Przełączanie do trybu komunikacji serwera narzędzia CMake.",
2021
"please.upgrade.cmake": "Aby zapewnić najlepsze środowisko, wymagana jest obsługa interfejsu file-api lub serwera narzędzia CMake. Uaktualnij narzędzie CMake do wersji {0} lub nowszej.",
2122
"starting.cmake.driver.status": "Trwa uruchamianie serwera narzędzia CMake...",
2223
"ready.status": "Gotowe",

‎i18n/ptb/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "O CMakeLists.txt não foi encontrado na raiz da pasta '{0}'",
1818
"starting.cmake.driver": "Iniciando o driver do CMake",
1919
"bad.cmake.executable": "Executável CMake \"{0}\" incorreto.",
20+
"switch.to.serverapi": "O modo de comunicação entre arquivo e API do CMake não tem suporte em versões anteriores à {0}. Alternando para o modo de comunicação do servidor do CMake.",
2021
"please.upgrade.cmake": "Para obter a melhor experiência, é necessário o suporte ao servidor CMake ou à file-api. Atualize o CMake para o {0} ou mais recente.",
2122
"starting.cmake.driver.status": "Iniciando o Servidor do CMake...",
2223
"ready.status": "Pronto",

‎i18n/rus/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "Файл CMakeLists.txt не найден в корневом каталоге папки \"{0}\"",
1818
"starting.cmake.driver": "Запуск драйвера CMake.",
1919
"bad.cmake.executable": "Неверный исполняемый файл CMake \"{0}\".",
20+
"switch.to.serverapi": "Режим взаимодействия file-api CMake не поддерживается в версиях ниже {0}. Переключение на режим взаимодействия сервера CMake.",
2021
"please.upgrade.cmake": "Для оптимальной работы требуется поддержка сервера CMake или file-api. Обновите CMake до версии {0} или более поздней версии.",
2122
"starting.cmake.driver.status": "Запуск сервера CMake…",
2223
"ready.status": "Готово",

‎i18n/trk/src/cmake-tools.i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"missing.cmakelists": "CMakeLists.txt, '{0}' klasörünün kökünde bulunamadı",
1818
"starting.cmake.driver": "CMake sürücüsü başlatılıyor",
1919
"bad.cmake.executable": "Hatalı \"{0}\" CMake yürütülebilir dosyası.",
20+
"switch.to.serverapi": "CMake dosya-API iletişim modu, {0} öncesi sürümlerde desteklenmiyor. CMake sunucu iletişimi moduna geçiliyor.",
2021
"please.upgrade.cmake": "En iyi deneyim için CMake sunucusu veya file-api desteği gereklidir. Lütfen CMake'i {0} veya daha yeni bir sürüme yükseltin.",
2122
"starting.cmake.driver.status": "CMake Sunucusu başlatılıyor...",
2223
"ready.status": "Hazır",

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cmake-tools",
33
"displayName": "CMake Tools",
44
"description": "Extended CMake support in Visual Studio Code",
5-
"version": "1.3.0",
5+
"version": "1.3.1",
66
"publisher": "ms-vscode",
77
"repository": {
88
"type": "git",
@@ -20,7 +20,7 @@
2020
"native"
2121
],
2222
"engines": {
23-
"vscode": "^1.29.1"
23+
"vscode": "^1.30.0"
2424
},
2525
"categories": [
2626
"Other"
@@ -1277,7 +1277,7 @@
12771277
"tslint": "^5.9.1",
12781278
"typedoc": "^0.15.3",
12791279
"typescript": "^3.7.2",
1280-
"vscode": "^1.1.35",
1280+
"vscode": "^1.1.36",
12811281
"vscode-nls-dev": "^3.2.6",
12821282
"webpack": "^4.39.2",
12831283
"webpack-cli": "^3.3.7"

‎src/cmake-tools.ts

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -272,44 +272,49 @@ export class CMakeTools implements vscode.Disposable, api.CMakeToolsAPI {
272272
const preferredGenerators = this.getPreferredGenerators();
273273
const preConditionHandler = async (e: CMakePreconditionProblems) => this.cmakePreConditionProblemHandler(e);
274274
let communicationMode = this.workspaceContext.config.cmakeCommunicationMode.toLowerCase();
275+
const fileApi = 'fileapi';
276+
const serverApi = 'serverapi';
277+
const legacy = 'legacy';
275278

276-
if (communicationMode == 'automatic') {
279+
if (communicationMode !== fileApi && communicationMode !== serverApi && communicationMode !== legacy) {
277280
if (cmake.isFileApiModeSupported) {
278-
communicationMode = 'fileapi';
281+
communicationMode = fileApi;
279282
} else if (cmake.isServerModeSupported) {
280-
communicationMode = 'serverapi';
283+
communicationMode = serverApi;
281284
} else {
282-
communicationMode = 'legacy';
285+
communicationMode = legacy;
283286
}
284-
} else if (communicationMode == 'fileapi') {
287+
} else if (communicationMode === fileApi) {
285288
if (!cmake.isFileApiModeSupported) {
286289
if (cmake.isServerModeSupported) {
287-
communicationMode = 'serverapi';
290+
communicationMode = serverApi;
288291
log.warning(
289292
localize('switch.to.serverapi',
290293
'CMake file-api communication mode is not supported in versions earlier than {0}. Switching to CMake server communication mode.',
291294
versionToString(cmake.minimalFileApiModeVersion)));
292295
} else {
293-
communicationMode = 'legacy';
296+
communicationMode = legacy;
294297
}
295298
}
296299
}
297300

298-
if (communicationMode != 'fileapi' && communicationMode != 'serverapi') {
301+
if (communicationMode !== fileApi && communicationMode !== serverApi) {
299302
log.warning(
300303
localize('please.upgrade.cmake',
301304
'For the best experience, CMake server or file-api support is required. Please upgrade CMake to {0} or newer.',
302305
versionToString(cmake.minimalServerModeVersion)));
303306
}
304307

305308
try {
306-
this._statusMessage.set(localize('starting.cmake.driver.status', 'Starting CMake Server...'));
309+
if (communicationMode === serverApi) {
310+
this._statusMessage.set(localize('starting.cmake.driver.status', 'Starting CMake Server...'));
311+
}
307312
switch (communicationMode) {
308-
case 'fileapi':
313+
case fileApi:
309314
drv = await CMakeFileApiDriver
310315
.create(cmake, this.workspaceContext.config, kit, workspace, preConditionHandler, preferredGenerators);
311316
break;
312-
case 'serverapi':
317+
case serverApi:
313318
drv = await CMakeServerClientDriver
314319
.create(cmake, this.workspaceContext.config, kit, workspace, preConditionHandler, preferredGenerators);
315320
break;

‎src/drivers/cmakefileapi/api_helpers.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,15 @@ async function convertTargetObjectFileToExtensionTarget(build_dir: string, file_
127127
if (targetObject.artifacts) {
128128
executable_path = targetObject.artifacts.find(artifact => artifact.path.endsWith(targetObject.nameOnDisk));
129129
if (executable_path) {
130-
executable_path = path.normalize(path.join(build_dir, executable_path.path));
130+
if (await fs.exists(executable_path.path)) {
131+
executable_path = path.normalize(executable_path.path);
132+
} else {
133+
executable_path = path.normalize(path.join(build_dir, executable_path.path));
134+
if (!fs.exists(executable_path)) {
135+
// Will be empty after cmake configuration
136+
executable_path = "";
137+
}
138+
}
131139
}
132140
}
133141

‎src/drivers/cmfileapi-driver.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ export class CMakeFileApiDriver extends codemodel.CodeModelDriver {
6565

6666
this._generator = {
6767
name: cache.get('CMAKE_GENERATOR')!.value,
68-
toolset: cache.get('CMAKE_GENERATOR_PLATFORM') ? cache.get('CMAKE_GENERATOR_PLATFORM')!.value : undefined,
69-
platform: cache.get('CMAKE_GENERATOR_TOOLSET') ? cache.get('CMAKE_GENERATOR_TOOLSET')!.value : undefined
68+
platform: cache.get('CMAKE_GENERATOR_PLATFORM') ? cache.get('CMAKE_GENERATOR_PLATFORM')!.value : undefined,
69+
toolset: cache.get('CMAKE_GENERATOR_TOOLSET') ? cache.get('CMAKE_GENERATOR_TOOLSET')!.value : undefined
7070
} as CMakeGenerator;
7171

7272
this._generatorInformation = {
7373
name: cache.get('CMAKE_GENERATOR')!.value,
74-
platform: cache.get('CMAKE_GENERATOR_TOOLSET') ? cache.get('CMAKE_GENERATOR_TOOLSET')!.value : undefined
74+
platform: cache.get('CMAKE_GENERATOR_PLATFORM') ? cache.get('CMAKE_GENERATOR_PLATFORM')!.value : undefined
7575
};
7676
}
7777

‎src/extension.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,10 @@ class ExtensionManager implements vscode.Disposable {
201201
* The project outline tree data provider
202202
*/
203203
private readonly _projectOutlineProvider = new ProjectOutlineProvider();
204-
private readonly _projectOutlineDisposer
205-
= vscode.window.registerTreeDataProvider('cmake.outline', this._projectOutlineProvider);
204+
private readonly _projectOutlineTreeView = vscode.window.createTreeView('cmake.outline', {
205+
treeDataProvider: this._projectOutlineProvider,
206+
showCollapseAll: true
207+
});
206208

207209
/**
208210
* CppTools project configuration provider. Tells cpptools how to search for
@@ -292,8 +294,9 @@ class ExtensionManager implements vscode.Disposable {
292294
)
293295
);
294296
this._onDidChangeActiveTextEditorSub.dispose();
297+
// tslint:disable-next-line: no-floating-promises
295298
this._kitsWatcher.close();
296-
this._projectOutlineDisposer.dispose();
299+
this._projectOutlineTreeView.dispose();
297300
if (this._cppToolsAPI) {
298301
this._cppToolsAPI.dispose();
299302
}

‎src/kit.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export enum SpecialKits {
3030
ScanForKits = '__scanforkits__',
3131
Unspecified = '__unspec__'
3232
}
33+
export const SpecialKitsCount: number = 2;
3334
export type UnspecifiedKit = SpecialKits.Unspecified;
3435

3536
type ProgressReporter = vscode.Progress<{message?: string}>;

‎src/kitsController.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import {
1515
kitsPathForWorkspaceFolder,
1616
OLD_USER_KITS_FILEPATH,
1717
SpecialKits,
18-
UnspecifiedKit
18+
UnspecifiedKit,
19+
SpecialKitsCount
1920
} from '@cmt/kit';
2021
import * as logging from '@cmt/logging';
2122
import paths from '@cmt/paths';
@@ -62,6 +63,7 @@ export class KitsController {
6263
if (this._pickKitCancellationTokenSource) {
6364
this._pickKitCancellationTokenSource.dispose();
6465
}
66+
// tslint:disable-next-line: no-floating-promises
6567
this._kitsWatcher.close();
6668
}
6769

@@ -164,11 +166,11 @@ export class KitsController {
164166

165167
private async _checkHaveKits(): Promise<UnspecifiedKit|'ok'|'cancel'> {
166168
const avail = this.availableKits;
167-
if (avail.length > 1) {
169+
if (avail.length > SpecialKitsCount) {
168170
// We have kits. Okay.
169171
return 'ok';
170172
}
171-
if (avail[0].name !== SpecialKits.Unspecified) {
173+
if (!avail.find(kit => kit.name == SpecialKits.Unspecified)) {
172174
// We should _always_ have the 'UnspecifiedKit'.
173175
rollbar.error(localize('invalid.only.kit', 'Invalid only kit. Expected to find `{0}`', SpecialKits.Unspecified));
174176
return 'ok';

‎src/variant.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ export class VariantManager implements vscode.Disposable {
190190

191191

192192
dispose() {
193+
// tslint:disable-next-line: no-floating-promises
193194
this._variantFileWatcher.close();
194195
this._activeVariantChanged.dispose();
195196
}

‎test/extension-tests/multi-root-UI/test/debugger.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as vscode from 'vscode';
44

55
// tslint:disable:no-unused-expression
66

7-
suite('[Debug/Lauch interface]', async () => {
7+
suite('[Debug/Launch interface]', async () => {
88
let testEnv: DefaultEnvironment;
99

1010
setup(async function(this: Mocha.IBeforeAndAfterContext) {

‎test/extension-tests/single-root-UI/test/debugger.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as vscode from 'vscode';
44

55
// tslint:disable:no-unused-expression
66

7-
suite('[Debug/Lauch interface]', async () => {
7+
suite('[Debug/Launch interface]', async () => {
88
let testEnv: DefaultEnvironment;
99

1010
setup(async function(this: Mocha.IBeforeAndAfterContext) {

‎test/extension-tests/successful-build/test/debugger.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as path from 'path';
66

77
// tslint:disable:no-unused-expression
88

9-
suite('[Debug/Lauch interface]', async () => {
9+
suite('[Debug/Launch interface]', async () => {
1010
let cmt: CMakeTools;
1111
let testEnv: DefaultEnvironment;
1212

‎test/unit-tests/driver/driver-codemodel-tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ export function makeCodeModelDriverTestsuite(
124124
}).timeout(90000);
125125

126126

127-
test('Test first executable target directory', async () => {
127+
test('Test executable target information', async () => {
128128
const codemodel_data = await generateCodeModelForConfiguredDriver();
129129
expect(codemodel_data).to.be.not.null;
130130

131-
const target = codemodel_data!.configurations[0].projects[0].targets.find(t => t.type == 'EXECUTABLE');
131+
const target = codemodel_data!.configurations[0].projects[0].targets.find(t => t.type == 'EXECUTABLE' && t.name == 'TestBuildProcess');
132132
expect(target).to.be.not.undefined;
133133

134134
// Test target name used for node label

0 commit comments

Comments
 (0)