Skip to content

Commit

Permalink
Let's see what blows up.
Browse files Browse the repository at this point in the history
  • Loading branch information
cecille committed Jan 23, 2024
1 parent e06d8ad commit ab71446
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 193,727 deletions.
3 changes: 1 addition & 2 deletions examples/darwin-framework-tool/main.mm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "commands/storage/Commands.h"

#include <zap-generated/cluster/Commands.h>
#include <zap-generated/test/Commands.h>
//#include <zap-generated/test/Commands.h>

int main(int argc, const char * argv[])
{
Expand All @@ -45,7 +45,6 @@ int main(int argc, const char * argv[])
registerCommandsPayload(commands);
registerClusterOtaSoftwareUpdateProviderInteractive(commands);
registerCommandsStorage(commands);
registerCommandsTests(commands);
registerClusters(commands);
return commands.Run(argc, (char **) argv);
}
Expand Down
20 changes: 0 additions & 20 deletions examples/darwin-framework-tool/templates/tests/commands.zapt
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,3 @@ public:
{{>test_cluster tests="manualTests.json" credsIssuerConfigArg=false}}

#endif // CONFIG_ENABLE_YAML_TESTS

void registerCommandsTests(Commands & commands)
{
const char * clusterName = "Tests";

commands_list clusterCommands = {
#if CONFIG_ENABLE_YAML_TESTS
make_unique<TestList>(),
make_unique<ManualTestList>(),
{{#chip_tests "ciTests.json" includeAllClusters=true}}
make_unique<{{filename}}>(),
{{/chip_tests}}
{{#chip_tests "manualTests.json" includeAllClusters=true}}
make_unique<{{filename}}>(),
{{/chip_tests}}
#endif // CONFIG_ENABLE_YAML_TESTS
};

commands.RegisterCommandSet(clusterName, clusterCommands, "Commands for running YAML tests.");
}
7 changes: 0 additions & 7 deletions examples/darwin-framework-tool/templates/tests/templates.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,5 @@
"name": "maybeCheckExpectedConstraints",
"path": "partials/checks/maybeCheckExpectedConstraints.zapt"
}
],
"templates": [
{
"path": "commands.zapt",
"name": "Tests Commands header",
"output": "test/Commands.h"
}
]
}
23 changes: 0 additions & 23 deletions scripts/tools/zap_regen_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class TargetType(Flag):


__TARGET_TYPES__ = {
'tests': TargetType.TESTS,
'global': TargetType.GLOBAL,
'idl_codegen': TargetType.IDL_CODEGEN,
'specific': TargetType.SPECIFIC,
Expand Down Expand Up @@ -446,25 +445,6 @@ def getCodegenTemplates():
return targets


def getTestsTemplatesTargets(test_target):
zap_input = ZapInput.FromPropertiesJson('src/app/zap-templates/zcl/zcl.json')
templates = {
'darwin-framework-tool': {
'template': 'examples/darwin-framework-tool/templates/tests/templates.json',
'output_dir': 'zzz_generated/darwin-framework-tool/zap-generated'
}
}

targets = []
for key, target in templates.items():
if test_target == 'all' or test_target == key:
logging.info("Found test target %s (via %s)" %
(key, target['template']))
targets.append(ZAPGenerateTarget(zap_input, template=target['template'], output_dir=target['output_dir']))

return targets


def getGoldenTestImageTargets():
return [GoldenTestImageTarget()]

Expand Down Expand Up @@ -494,9 +474,6 @@ def getSpecificTemplatesTargets():
def getTargets(type, test_target):
targets = []

if type & TargetType.TESTS:
targets.extend(getTestsTemplatesTargets(test_target))

if type & TargetType.GLOBAL:
targets.extend(getGlobalTemplatesTargets())

Expand Down
Loading

0 comments on commit ab71446

Please sign in to comment.