Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-19 08:30:25 +02:00
Code Activity

Made 'Test' a project type

Browse source
This commit is contained in:
Brian Fiete 2020-09-27 22:20:26 -07:00
parent ee71c8c97b
commit 784bd6d374
8 changed files with 57 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

46
IDE/src/Workspace.bf
View file

@ -263,14 +263,6 @@ namespace IDE
#endif
}
}
public bool IsTestProject(Project project)
{
return ((mBuildKind == .Test) &&
((project.mGeneralOptions.mTargetType == .BeefConsoleApplication) ||
(project.mGeneralOptions.mTargetType == .BeefGUIApplication) ||
(project.mGeneralOptions.mTargetType == .BeefConsoleApplication)));
}
public void CopyFrom(Workspace.Options prev)
{
@ -686,16 +678,33 @@ namespace IDE
for (var configPair in options.mConfigSelections)
{
let projectName = configPair.key.mProjectName;
using (data.CreateObject(projectName))
{
String expectConfig = configName;
if (isTest)
{
if (projectName != mProjects[0].mProjectName)
expectConfig = "Debug";
}
var configSelection = configPair.value;
bool wantEntry = configSelection.mEnabled != true;
wantEntry |= configSelection.mPlatform != platformName;
var configSelection = configPair.value;
String expectConfig = configName;
if (isTest)
{
if (projectName != mProjects[0].mProjectName)
expectConfig = "Debug";
if (!wantEntry)
{
// If we are leaving this entry blank and we have the 'Test' type set for an explicitly-test project
// then just skip the whole entry
var project = FindProject(projectName);
if ((project != null) && (project.mGeneralOptions.mTargetType == .BeefTest) && (configName == "Test"))
continue;
}
}
wantEntry |= configSelection.mConfig != expectConfig;
if (!wantEntry)
continue;
using (data.CreateObject(projectName))
{
data.ConditionalAdd("Enabled", configSelection.mEnabled, true);
data.ConditionalAdd("Config", configSelection.mConfig, expectConfig);
data.ConditionalAdd("Platform", configSelection.mPlatform, platformName);
@ -1110,7 +1119,8 @@ namespace IDE
if (isTest)
{
if (project != mProjects[0])
if ((project != mProjects[0]) &&
(project.mGeneralOptions.mTargetType != .BeefTest))
{
findConfig = "Debug";
}