|WARNING| pw111339 [PATCH] examples/fips_validation: cleanup bypass tests in response file

|WARNING| pw111339 [PATCH] examples/fips_validation: cleanup bypass tests in response file

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 3749 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/111339

_apply patch failure_

Submitter: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
Date: Thursday, May 19 2022 06:07:30 
Applied on: CommitID:68c050954ff393b894aa3672a5ef1a231597dab0
Apply patch set 111339 failed:

Checking patch examples/fips_validation/main.c...
Hunk #1 succeeded at 822 (offset 17 lines).
Hunk #2 succeeded at 774 (offset -79 lines).
Hunk #3 succeeded at 859 (offset -31 lines).
Hunk #4 succeeded at 905 (offset -31 lines).
Hunk #5 succeeded at 950 (offset -31 lines).
Hunk #6 succeeded at 988 (offset -31 lines).
Hunk #7 succeeded at 1034 (offset -31 lines).
Hunk #8 succeeded at 1069 (offset -31 lines).
Hunk #9 succeeded at 1109 (offset -31 lines).
Hunk #10 succeeded at 1223 (offset -32 lines).
error: while searching for:
		fprintf(info.fp_wr, "\n");
	free(val.val);

	return 0;
}

static int

error: patch failed: examples/fips_validation/main.c:1290
Hunk #12 succeeded at 1425 (offset -34 lines).
Hunk #13 succeeded at 1504 (offset -34 lines).
Hunk #14 succeeded at 1612 (offset -34 lines).
Hunk #15 succeeded at 1698 (offset -34 lines).
Hunk #16 succeeded at 1813 (offset -34 lines).
error: while searching for:
	int ret;

	ret = fips_test_parse_one_json_case();

	switch (ret) {
	case 0:
		ret = test_ops.test();
		if (ret == 0)
			break;
		RTE_LOG(ERR, USER1, "Error %i: test block\n",
				ret);
		break;
	case 1:
		break;
	default:
		RTE_LOG(ERR, USER1, "Error %i: Parse block\n",
				ret);
	}
	return 0;
}

static int

error: patch failed: examples/fips_validation/main.c:1908
error: while searching for:
	tests_size = json_array_size(tests);
	for (test_idx = 0; test_idx < tests_size; test_idx++) {
		json_info.json_test_case = json_array_get(tests, test_idx);
		fips_test_one_test_case();
		json_array_append_new(write_tests, json_info.json_write_case);
	}

	return 0;

error: patch failed: examples/fips_validation/main.c:1968
Applying patch examples/fips_validation/main.c with 3 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Rejected hunk #11.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Hunk #16 applied cleanly.
Rejected hunk #17.
Rejected hunk #18.
diff a/examples/fips_validation/main.c b/examples/fips_validation/main.c	(rejected hunks)
@@ -1290,7 +1290,7 @@ fips_generic_test(void)
 		fprintf(info.fp_wr, "\n");
 	free(val.val);
 
-	return 0;
+	return 1;
 }
 
 static int
@@ -1908,22 +1905,21 @@ fips_test_one_test_case(void)
 	int ret;
 
 	ret = fips_test_parse_one_json_case();
+	if (ret < 0) {
+		RTE_LOG(ERR, USER1, "Error %i: Parse block\n",
+				ret);
+		goto exit;
+	}
 
-	switch (ret) {
-	case 0:
-		ret = test_ops.test();
-		if (ret == 0)
-			break;
+	ret = test_ops.test();
+	if (ret < 0) {
 		RTE_LOG(ERR, USER1, "Error %i: test block\n",
 				ret);
-		break;
-	case 1:
-		break;
-	default:
-		RTE_LOG(ERR, USER1, "Error %i: Parse block\n",
-				ret);
+		goto exit;
 	}
-	return 0;
+
+exit:
+	return ret;
 }
 
 static int
@@ -1968,8 +1964,8 @@ fips_test_one_test_group(void)
 	tests_size = json_array_size(tests);
 	for (test_idx = 0; test_idx < tests_size; test_idx++) {
 		json_info.json_test_case = json_array_get(tests, test_idx);
-		fips_test_one_test_case();
-		json_array_append_new(write_tests, json_info.json_write_case);
+		if (fips_test_one_test_case() > 0)
+			json_array_append_new(write_tests, json_info.json_write_case);
 	}
 
 	return 0;

https://lab.dpdk.org/results/dashboard/patchsets/22178/

UNH-IOL DPDK Community Lab