diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:39 +0000 |
| commit | 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 (patch) | |
| tree | 3bb8d61aee02bc7a15eab3f36e3b921afc2075d0 /tests/run-make/libtest-json | |
| parent | Releasing progress-linux version 1.69.0+dfsg1-1~progress7.99u1. (diff) | |
| download | rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.tar.xz rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.zip | |
Merging upstream version 1.70.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | tests/run-make/libtest-json/Makefile (renamed from tests/run-make-fulldeps/libtest-json/Makefile) | 1 | ||||
| -rw-r--r-- | tests/run-make/libtest-json/f.rs (renamed from tests/run-make-fulldeps/libtest-json/f.rs) | 0 | ||||
| -rw-r--r-- | tests/run-make/libtest-json/output-default.json (renamed from tests/run-make-fulldeps/libtest-json/output-default.json) | 0 | ||||
| -rw-r--r-- | tests/run-make/libtest-json/output-stdout-success.json (renamed from tests/run-make-fulldeps/libtest-json/output-stdout-success.json) | 0 | ||||
| -rwxr-xr-x | tests/run-make/libtest-json/validate_json.py (renamed from tests/run-make-fulldeps/libtest-json/validate_json.py) | 0 |
5 files changed, 1 insertions, 0 deletions
diff --git a/tests/run-make-fulldeps/libtest-json/Makefile b/tests/run-make/libtest-json/Makefile index 37b6cb9e2..417637cf0 100644 --- a/tests/run-make-fulldeps/libtest-json/Makefile +++ b/tests/run-make/libtest-json/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test expected libtest's JSON output diff --git a/tests/run-make-fulldeps/libtest-json/f.rs b/tests/run-make/libtest-json/f.rs index edfe25086..edfe25086 100644 --- a/tests/run-make-fulldeps/libtest-json/f.rs +++ b/tests/run-make/libtest-json/f.rs diff --git a/tests/run-make-fulldeps/libtest-json/output-default.json b/tests/run-make/libtest-json/output-default.json index ad22b66ed..ad22b66ed 100644 --- a/tests/run-make-fulldeps/libtest-json/output-default.json +++ b/tests/run-make/libtest-json/output-default.json diff --git a/tests/run-make-fulldeps/libtest-json/output-stdout-success.json b/tests/run-make/libtest-json/output-stdout-success.json index ec98172eb..ec98172eb 100644 --- a/tests/run-make-fulldeps/libtest-json/output-stdout-success.json +++ b/tests/run-make/libtest-json/output-stdout-success.json diff --git a/tests/run-make-fulldeps/libtest-json/validate_json.py b/tests/run-make/libtest-json/validate_json.py index 657f732f2..657f732f2 100755 --- a/tests/run-make-fulldeps/libtest-json/validate_json.py +++ b/tests/run-make/libtest-json/validate_json.py |