From 574fff49721ad427cc9c4e9c32645fcd5b56fe09 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Thu, 9 Feb 2023 15:49:19 +0000
Subject: [PATCH] tests: error when both env var and cmd line arg try to set
 iteration

`./tests a` results in the COUNT being set to 64 instead of erroring out as
before. This is fixed in the next commit.
---
 src/tests.c | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/tests.c b/src/tests.c
index bf47ba9abb..266c8420c4 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -7430,6 +7430,32 @@ static void run_cmov_tests(void) {
     ge_storage_cmov_test();
 }
 
+static int process_args(int argc, char **argv) {
+    int is_count_arg_set = 0;
+    const char* env = getenv("SECP256K1_TEST_ITERS");
+
+    if (argc > 1) {
+        int count_arg = strtol(argv[1], NULL, 0);
+        if (count_arg > 0) {
+            is_count_arg_set = 1;
+            COUNT = count_arg;
+        }
+    }
+
+    if (env && strlen(env) > 0) {
+        COUNT = strtol(env, NULL, 0);
+        if (is_count_arg_set) {
+            fputs("Environment variable SECP256K1_TEST_ITERS and command line argument both try to set the iteration count.\n", stderr);
+            return 0;
+        }
+        if (COUNT <= 0) {
+            fputs("An iteration count of 0 or less is not allowed.\n", stderr);
+            return 0;
+        }
+    }
+    return 1;
+}
+
 static void help(void) {
     printf("The command ./tests runs a test suite on the code base.\n");
     printf("\n");
@@ -7463,17 +7489,8 @@ int main(int argc, char **argv) {
         }
     }
 
-    /* find iteration count */
-    if (argc > 1) {
-        COUNT = strtol(argv[1], NULL, 0);
-    } else {
-        const char* env = getenv("SECP256K1_TEST_ITERS");
-        if (env && strlen(env) > 0) {
-            COUNT = strtol(env, NULL, 0);
-        }
-    }
-    if (COUNT <= 0) {
-        fputs("An iteration count of 0 or less is not allowed.\n", stderr);
+    if (!process_args(argc, argv)) {
+        help();
         return EXIT_FAILURE;
     }
     printf("test count = %i\n", COUNT);