forked from omniti-labs/omnios-build
-
-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3727 from citrus-it/pkgupd
Core package updates
- Loading branch information
Showing
42 changed files
with
2,123 additions
and
1,169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TESTDONE: 1728 tests were considered during 543 seconds. | ||
TESTDONE: 1392 tests out of 1393 reported OK: 99% | ||
TESTDONE: 1739 tests were considered during 629 seconds. | ||
TESTDONE: 1430 tests out of 1431 reported OK: 99% | ||
TESTFAIL: These test cases failed: 1004 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
system-processor.patch | ||
testsuite.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
From a5528768a1e7a254707bad1b54d8e2f65c9490d2 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Iy=C3=A1n?= <[email protected]> | ||
Date: Fri, 27 Sep 2024 21:10:33 +0200 | ||
Subject: [PATCH] Remove hardcoded build patch from test script (#1938) | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
If a user has passed a custom build path to cmake, and then calls for | ||
example `ninja -C <custom_build_path> run_tests`, the script | ||
test_acvp_vectors.py fails due to having "build" harcoded in the calls. | ||
|
||
Instead, let's use `helpers.get_current_build_dir_name()` to get the build | ||
path and use that instead. This is already done in other scripts (e.g., | ||
test_binary.py) | ||
|
||
Signed-off-by: Iyán Méndez Veiga <[email protected]> | ||
--- | ||
tests/test_acvp_vectors.py | 15 +++++++++------ | ||
1 file changed, 9 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/tests/test_acvp_vectors.py b/tests/test_acvp_vectors.py | ||
index 4eee4b810..ddd64003c 100644 | ||
--- a/tests/test_acvp_vectors.py | ||
+++ b/tests/test_acvp_vectors.py | ||
@@ -36,9 +36,10 @@ def test_acvp_vec_kem_keygen(kem_name): | ||
z = testCase["z"] | ||
pk = testCase["ek"] | ||
sk = testCase["dk"] | ||
- | ||
+ | ||
+ build_dir = helpers.get_current_build_dir_name() | ||
helpers.run_subprocess( | ||
- ['build/tests/vectors_kem', kem_name, "keyGen", d+z, pk, sk] | ||
+ [f'{build_dir}/tests/vectors_kem', kem_name, "keyGen", d+z, pk, sk] | ||
) | ||
|
||
assert(variantFound == True) | ||
@@ -66,9 +67,10 @@ def test_acvp_vec_kem_encdec_aft(kem_name): | ||
#expected results | ||
k = testCase["k"] | ||
c = testCase["c"] | ||
- | ||
+ | ||
+ build_dir = helpers.get_current_build_dir_name() | ||
helpers.run_subprocess( | ||
- ['build/tests/vectors_kem', kem_name, "encDecAFT", m, pk, k, c] | ||
+ [f'{build_dir}/tests/vectors_kem', kem_name, "encDecAFT", m, pk, k, c] | ||
) | ||
|
||
assert(variantFound == True) | ||
@@ -94,9 +96,10 @@ def test_acvp_vec_kem_encdec_val(kem_name): | ||
c = testCase["c"] | ||
#expected results | ||
k = testCase["k"] | ||
- | ||
+ | ||
+ build_dir = helpers.get_current_build_dir_name() | ||
helpers.run_subprocess( | ||
- ['build/tests/vectors_kem', kem_name, "encDecVAL", sk, k, c] | ||
+ [f'{build_dir}/tests/vectors_kem', kem_name, "encDecVAL", sk, k, c] | ||
) | ||
|
||
assert(variantFound == True) |
Oops, something went wrong.