diff --git a/python/gramine-test b/python/gramine-test index b0c3d38fbc..d5fe24a3b3 100755 --- a/python/gramine-test +++ b/python/gramine-test @@ -63,6 +63,11 @@ def clean(ctx): if os.path.exists(name): print(f'deleting {name}') os.unlink(name) + for name in os.listdir(os.getcwd()): + # token files are created by Gramine itself, not known to Ninja build system + if name.endswith('.token'): + print(f'deleting {name}') + os.unlink(name) @main.command( diff --git a/python/graminelibos/util_tests.py b/python/graminelibos/util_tests.py index c108fc944a..2819d13ab4 100644 --- a/python/graminelibos/util_tests.py +++ b/python/graminelibos/util_tests.py @@ -39,7 +39,7 @@ class TestConfig: Ninja handles the following targets: - - `NAME.manifest`, `NAME.manifest.sgx`, `NAME.sig`, `NAME.token` + - `NAME.manifest`, `NAME.manifest.sgx`, `NAME.sig` - `direct`, `sgx`: all files - `direct-NAME`, `sgx-NAME`: files related to a single manifest ''' @@ -135,13 +135,6 @@ def _gen_rules(self, ninja): ) ninja.newline() - ninja.rule( - name='sgx-get-token', - command='gramine-sgx-get-token --quiet --sig $in --output $out', - description='SGX token: $out', - ) - ninja.newline() - ninja.rule( name='regenerate', command='gramine-test regenerate', @@ -172,8 +165,7 @@ def _gen_targets(self, ninja, ninja_path): rule='phony', inputs=([f'{name}.manifest' for name in self.all_manifests] + [f'{name}.manifest.sgx' for name in self.all_manifests] + - [f'{name}.sig' for name in self.all_manifests] + - [f'{name}.token' for name in self.all_manifests]), + [f'{name}.sig' for name in self.all_manifests]), ) ninja.newline() @@ -197,12 +189,6 @@ def _gen_targets(self, ninja, ninja_path): implicit=([self.key]), ) - ninja.build( - outputs=[f'{name}.token'], - rule='sgx-get-token', - inputs=[f'{name}.sig'], - ) - ninja.build( outputs=[f'direct-{name}'], rule='phony', @@ -212,7 +198,7 @@ def _gen_targets(self, ninja, ninja_path): ninja.build( outputs=[f'sgx-{name}'], rule='phony', - inputs=[f'{name}.manifest', f'{name}.manifest.sgx', f'{name}.sig', f'{name}.token'], + inputs=[f'{name}.manifest', f'{name}.manifest.sgx', f'{name}.sig'], ) ninja.newline()