Expand VLR tests

Print the IMSI used for each test. This enables expansion to tests with
several IMSIs in follow-up patches.

Change-Id: I7958608e5136351f7b7c0c57fe79791d989ce9c3
Related: OS#2864

12 files changed, 18 insertions, 6 deletions

diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.ok b/tests/msc_vlr/msc_vlr_test_authen_reuse.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.ok
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_call.ok b/tests/msc_vlr/msc_vlr_test_call.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_call.ok
+++ b/tests/msc_vlr/msc_vlr_test_call.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.ok b/tests/msc_vlr/msc_vlr_test_gsm_authen.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.ok
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.ok b/tests/msc_vlr/msc_vlr_test_gsm_ciph.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.ok
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.ok b/tests/msc_vlr/msc_vlr_test_hlr_reject.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.ok
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.ok b/tests/msc_vlr/msc_vlr_test_hlr_timeout.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.ok
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.ok b/tests/msc_vlr/msc_vlr_test_ms_timeout.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.ok
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.ok b/tests/msc_vlr/msc_vlr_test_no_authen.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.ok
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.ok b/tests/msc_vlr/msc_vlr_test_reject_concurrency.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.ok
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_rest.ok b/tests/msc_vlr/msc_vlr_test_rest.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.ok
+++ b/tests/msc_vlr/msc_vlr_test_rest.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.ok b/tests/msc_vlr/msc_vlr_test_umts_authen.ok
index a965a70ed..1861dfc45 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.ok
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.ok
@@ -1 +1,2 @@
+Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index fd6662853..0d4656e7f 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -818,10 +818,11 @@ static void handle_options(int argc, char **argv)
 
 void *msgb_ctx = NULL;
 
-static void run_tests(int nr)
+static void run_tests(int nr, const char *imsi)
 {
 	int test_nr;
-	const char *imsi = "901700000004620";
+
+	printf("Testing for IMSI %s\n", imsi);
 
 	nr--; /* arg's first test is 1, in here it's 0 */
 	for (test_nr = 0; msc_vlr_tests[test_nr]; test_nr++) {
@@ -880,9 +881,9 @@ int main(int argc, char **argv)
 
 	clear_vlr();
 
-	if (optind >= argc)
-		run_tests(-1);
-	else {
+	if (optind >= argc) {
+		run_tests(-1, "901700000004620");
+	} else {
 		int arg;
 		long int nr;
 		for (arg = optind; arg < argc; arg++) {
@@ -894,7 +895,7 @@ int main(int argc, char **argv)
 				exit(1);
 			}
 
-			run_tests(nr);
+			run_tests(nr, "901700000004620");
 		}
 	}