diff --git a/testing/testing_zgeadd.c b/testing/testing_zgeadd.c
index 58b5c3a0c3fa5472553f2613c3a9e8319a293cff..00358df0c5089fe3dddb3f95fd6bb580d05f7d6b 100644
--- a/testing/testing_zgeadd.c
+++ b/testing/testing_zgeadd.c
@@ -37,7 +37,6 @@ flops_zgeadd( int M, int N )
 int
 testing_zgeadd( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     int          Am, An;
     CHAM_desc_t *descA, *descB;
@@ -103,7 +102,6 @@ testing_zgeadd( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descB );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgelqf.c b/testing/testing_zgelqf.c
index 0b80eb59a028ca6282ec55409fef2c9714c2850c..db11f2d8ff61a78640e10598999385c087c1cccf 100644
--- a/testing/testing_zgelqf.c
+++ b/testing/testing_zgelqf.c
@@ -23,7 +23,6 @@
 int
 testing_zgelqf( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descT;
 
@@ -88,7 +87,6 @@ testing_zgelqf( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descT );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgelqf_hqr.c b/testing/testing_zgelqf_hqr.c
index 64634e29a7ef85ab82f0eacc510392bffde675af..a5b3d57a3bf683c372ccbf9b0ba0491c639963eb 100644
--- a/testing/testing_zgelqf_hqr.c
+++ b/testing/testing_zgelqf_hqr.c
@@ -23,7 +23,6 @@
 int
 testing_zgelqf_hqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descTS, *descTT;
 
@@ -98,7 +97,6 @@ testing_zgelqf_hqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descTT );
     libhqr_finalize( &qrtree );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgelqs.c b/testing/testing_zgelqs.c
index aa9f3d18e8163a843d67863b4a2b771e0e1082f0..3b9d23bd5e92dfa635f1c0c2c3251868d754d41e 100644
--- a/testing/testing_zgelqs.c
+++ b/testing/testing_zgelqs.c
@@ -31,7 +31,6 @@ flops_zgelqs()
 int
 testing_zgelqs( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA1, *descA2, *descB1, *descB2, *descT, *descQ, *descX;
 
@@ -105,7 +104,6 @@ testing_zgelqs( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descX );
     CHAMELEON_Desc_Destroy( &descT );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgels.c b/testing/testing_zgels.c
index ca461b5dbd006b56f5bd51e28c1e9adc774b9163..6e78dae1bb04781db5c8780858f32fd2d523a25b 100644
--- a/testing/testing_zgels.c
+++ b/testing/testing_zgels.c
@@ -35,7 +35,6 @@ flops_zgels( cham_trans_t trans, int M, int N, int NRHS )
 int
 testing_zgels( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descX, *descT;
 
@@ -125,7 +124,6 @@ testing_zgels( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descT );
     CHAMELEON_Desc_Destroy( &descX );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgels_hqr.c b/testing/testing_zgels_hqr.c
index 99fbb627edd1714b078220080446d3c98e9aff20..3bf679addbe62406150a869055dec779de34c204 100644
--- a/testing/testing_zgels_hqr.c
+++ b/testing/testing_zgels_hqr.c
@@ -35,7 +35,6 @@ flops_zgels_hqr( cham_trans_t trans, int M, int N, int NRHS )
 int
 testing_zgels_hqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descX, *descTS, *descTT;
 
@@ -133,7 +132,6 @@ testing_zgels_hqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descX );
     libhqr_finalize( &qrtree );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgemm.c b/testing/testing_zgemm.c
index c37ba5d7cb61d0e43859cefdfd1bc81bbf9684da..c9cc3943c11dc0a96b3f56799d75cf8afa2c19f2 100644
--- a/testing/testing_zgemm.c
+++ b/testing/testing_zgemm.c
@@ -23,7 +23,6 @@
 int
 testing_zgemm( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am, An, Bm, Bn;
     int          hres = 0;
     CHAM_desc_t *descA, *descB, *descC, *descCinit;
@@ -107,7 +106,6 @@ testing_zgemm( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descB );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgeqrf.c b/testing/testing_zgeqrf.c
index 897b5e570c9436b4b1b0853f9db388671bbb183a..96fb92f8f643df4094d412209d95e754456b5056 100644
--- a/testing/testing_zgeqrf.c
+++ b/testing/testing_zgeqrf.c
@@ -23,7 +23,6 @@
 int
 testing_zgeqrf( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descT;
 
@@ -88,7 +87,6 @@ testing_zgeqrf( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descT );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgeqrf_hqr.c b/testing/testing_zgeqrf_hqr.c
index 014f24ab0640b6855f93af3d93fbdcda6c4db9e9..b4d264e185e0c0cd0d90d1f585be6b6ac1a81eb3 100644
--- a/testing/testing_zgeqrf_hqr.c
+++ b/testing/testing_zgeqrf_hqr.c
@@ -23,7 +23,6 @@
 int
 testing_zgeqrf_hqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descTS, *descTT;
 
@@ -98,7 +97,6 @@ testing_zgeqrf_hqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descTT );
     libhqr_finalize( &qrtree );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgeqrs.c b/testing/testing_zgeqrs.c
index d2ac7482700b6537d668bcf65e70b26c0d502b02..a7eb9d3c5d94a46e9ff9a29eb4ab20f536c008ef 100644
--- a/testing/testing_zgeqrs.c
+++ b/testing/testing_zgeqrs.c
@@ -24,7 +24,6 @@
 int
 testing_zgeqrs( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descX, *descT;
 
@@ -105,7 +104,6 @@ testing_zgeqrs( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descX );
     CHAMELEON_Desc_Destroy( &descT );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgesv.c b/testing/testing_zgesv.c
index ef6679fb399dc969c288f328c436b73f9d752d19..1b38fa53d39c9fb412a636adec3c107ae42e3207 100644
--- a/testing/testing_zgesv.c
+++ b/testing/testing_zgesv.c
@@ -30,7 +30,6 @@ flops_zgesv( int N, int NRHS )
 int
 testing_zgesv( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descX;
 
@@ -91,7 +90,6 @@ testing_zgesv( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descX );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgetrf.c b/testing/testing_zgetrf.c
index 7add05aafd4b60151a6f91ad7f328dda8a921e07..67bba59850f5acb5cdb00d118693c7078cdd3656 100644
--- a/testing/testing_zgetrf.c
+++ b/testing/testing_zgetrf.c
@@ -23,7 +23,6 @@
 int
 testing_zgetrf( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA;
 
@@ -67,7 +66,6 @@ testing_zgetrf( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zgetrs.c b/testing/testing_zgetrs.c
index 861df74b20f3e1a86742874c96fac32d25bbb9ee..c665c63705af42bd7cdd68d042fda1078a684822 100644
--- a/testing/testing_zgetrs.c
+++ b/testing/testing_zgetrs.c
@@ -24,7 +24,6 @@
 int
 testing_zgetrs( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres;
     CHAM_desc_t *descA, *descX;
 
@@ -81,7 +80,6 @@ testing_zgetrs( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descX );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zhemm.c b/testing/testing_zhemm.c
index 5879607cafbf4d626a7b2e5901ce75ec311ec420..eb0dda06088ab9df0de7fe8ae6a493ae7bc504ab 100644
--- a/testing/testing_zhemm.c
+++ b/testing/testing_zhemm.c
@@ -23,7 +23,6 @@
 int
 testing_zhemm( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am;
     int          hres = 0;
     CHAM_desc_t *descA, *descB, *descC, *descCinit;
@@ -99,7 +98,6 @@ testing_zhemm( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descB );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zher2k.c b/testing/testing_zher2k.c
index 605fc7e24719f5853a74d94f48204f43b490ff58..ca179840cd30f75a7a56eb5dfcb392ef97aed2e3 100644
--- a/testing/testing_zher2k.c
+++ b/testing/testing_zher2k.c
@@ -23,7 +23,6 @@
 int
 testing_zher2k( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am, An;
     int          hres = 0;
     CHAM_desc_t *descA, *descB, *descC, *descCinit;
@@ -101,7 +100,6 @@ testing_zher2k( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descB );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zherk.c b/testing/testing_zherk.c
index fa2c51c0bb022fe4a41b2cd164403f6c1b1d1e41..ff93b7ee7ee526e21d8dfa1638d48e75068ae534 100644
--- a/testing/testing_zherk.c
+++ b/testing/testing_zherk.c
@@ -24,7 +24,6 @@
 int
 testing_zherk( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am, An;
     int          hres = 0;
     CHAM_desc_t *descA, *descC, *descCinit;
@@ -96,7 +95,6 @@ testing_zherk( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zlacpy.c b/testing/testing_zlacpy.c
index e6ba9d3501acddb545c98abf24229275700497b3..0e068822c07b72a7bdf9ebeeb4a65915f2d021d6 100644
--- a/testing/testing_zlacpy.c
+++ b/testing/testing_zlacpy.c
@@ -54,7 +54,6 @@ flops_zlacpy( cham_uplo_t uplo, int M, int N )
 int
 testing_zlacpy( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descB;
 
@@ -100,7 +99,6 @@ testing_zlacpy( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descB );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zlange.c b/testing/testing_zlange.c
index 6205683f3e0c2a8f5bc6ab6b9e0cb6882e0a423d..6484e788279e62d6e397d5f82a0b72cf37594594 100644
--- a/testing/testing_zlange.c
+++ b/testing/testing_zlange.c
@@ -50,7 +50,6 @@ flops_zlange( cham_normtype_t ntype, int M, int N )
 int
 testing_zlange( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     double       norm;
     CHAM_desc_t *descA;
@@ -91,7 +90,6 @@ testing_zlange( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zlanhe.c b/testing/testing_zlanhe.c
index bf77fb951128c6f41394cf15edd53b2ab7e56c0b..a15d6d61bd7b5d51f9a9decd208983f10965a4dc 100644
--- a/testing/testing_zlanhe.c
+++ b/testing/testing_zlanhe.c
@@ -48,7 +48,6 @@ flops_zlanhe( cham_normtype_t ntype, int N )
 int
 testing_zlanhe( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     double       norm;
     CHAM_desc_t *descA;
@@ -92,7 +91,6 @@ testing_zlanhe( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zlansy.c b/testing/testing_zlansy.c
index 11460d7b0205424147be3661ef9048737df7671f..fe38d04e84ed7ed8557192479ca1f9fd32f021fa 100644
--- a/testing/testing_zlansy.c
+++ b/testing/testing_zlansy.c
@@ -48,7 +48,6 @@ flops_zlansy( cham_normtype_t ntype, int N )
 int
 testing_zlansy( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     double       norm;
     CHAM_desc_t *descA;
@@ -92,7 +91,6 @@ testing_zlansy( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zlantr.c b/testing/testing_zlantr.c
index a4c72a7621bb5257fc939e36312368e249a0938b..f8f11cdb206d655f79e2cb92fa5c828e90ba5e34 100644
--- a/testing/testing_zlantr.c
+++ b/testing/testing_zlantr.c
@@ -69,7 +69,6 @@ flops_zlantr( cham_normtype_t ntype, cham_uplo_t uplo, int M, int N )
 int
 testing_zlantr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     double       norm;
     CHAM_desc_t *descA;
@@ -112,7 +111,6 @@ testing_zlantr( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zlascal.c b/testing/testing_zlascal.c
index 98ab975cf3c8426e0cd4f7211abf7d6f9fe75351..7717d29933d60ad04460306de47dd4b0b73617e5 100644
--- a/testing/testing_zlascal.c
+++ b/testing/testing_zlascal.c
@@ -48,7 +48,6 @@ flops_zlascal( cham_uplo_t uplo, int M, int N )
 int
 testing_zlascal( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descAinit;
 
@@ -95,7 +94,6 @@ testing_zlascal( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zlauum.c b/testing/testing_zlauum.c
index c8b81f5d8a1411e11bb57d9e362e4e747d767378..99b5e362c4e89179c2a66f95dbaf550dc939fb58 100644
--- a/testing/testing_zlauum.c
+++ b/testing/testing_zlauum.c
@@ -30,7 +30,6 @@ flops_zlauum( int N )
 int
 testing_zlauum( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA;
 
@@ -73,7 +72,6 @@ testing_zlauum( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zposv.c b/testing/testing_zposv.c
index 4025af02bb559f749d6765c28b9bf39444ddb0b4..09016d54e6d72bda33bf06f61babd14e69069904 100644
--- a/testing/testing_zposv.c
+++ b/testing/testing_zposv.c
@@ -30,7 +30,6 @@ flops_zposv( int N, int NRHS )
 int
 testing_zposv( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descX;
 
@@ -92,7 +91,6 @@ testing_zposv( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descX );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zpotrf.c b/testing/testing_zpotrf.c
index 1db783f0cc14a7fecc39dcefd3290e643653d57f..d3e2a452a5f2e7ab93b65dff48fb0dbc3066edca 100644
--- a/testing/testing_zpotrf.c
+++ b/testing/testing_zpotrf.c
@@ -23,7 +23,6 @@
 int
 testing_zpotrf( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA;
 
@@ -67,7 +66,6 @@ testing_zpotrf( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zpotri.c b/testing/testing_zpotri.c
index 065181b9e92051a461fa2ab6f67f6060520042ae..0e57f59d3e29d7a202667936ce5bec5821adcda0 100644
--- a/testing/testing_zpotri.c
+++ b/testing/testing_zpotri.c
@@ -24,7 +24,6 @@
 int
 testing_zpotri( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres;
     CHAM_desc_t *descA;
 
@@ -72,7 +71,6 @@ testing_zpotri( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zpotrs.c b/testing/testing_zpotrs.c
index d2c55ac8ec9569a25642783031c1efd33a216bf4..21c908a8a42c3c7ceddd06f266a957c9caa15f6f 100644
--- a/testing/testing_zpotrs.c
+++ b/testing/testing_zpotrs.c
@@ -24,7 +24,6 @@
 int
 testing_zpotrs( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres;
     CHAM_desc_t *descA, *descX;
 
@@ -82,7 +81,6 @@ testing_zpotrs( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descX );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zsymm.c b/testing/testing_zsymm.c
index d3afed02cd669a1abc6220c9b9e187e51229208a..b6a9a2a497541d49e00e096430df417ef00b36df 100644
--- a/testing/testing_zsymm.c
+++ b/testing/testing_zsymm.c
@@ -23,7 +23,6 @@
 int
 testing_zsymm( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am;
     int          hres = 0;
     CHAM_desc_t *descA, *descB, *descC, *descCinit;
@@ -99,7 +98,6 @@ testing_zsymm( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descB );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zsyr2k.c b/testing/testing_zsyr2k.c
index de86364ae64dd8f25dfa19b897a9556a17de0a26..1d173f1cf141839e5d7032b4a3d92b15553465df 100644
--- a/testing/testing_zsyr2k.c
+++ b/testing/testing_zsyr2k.c
@@ -23,7 +23,6 @@
 int
 testing_zsyr2k( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am, An;
     int          hres = 0;
     CHAM_desc_t *descA, *descB, *descC, *descCinit;
@@ -101,7 +100,6 @@ testing_zsyr2k( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descB );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zsyrk.c b/testing/testing_zsyrk.c
index c13fa2cbf32c57713f568db9199b44e4844217b6..70ec507f6c5816d65001c1fbdcdd26857d35f1c3 100644
--- a/testing/testing_zsyrk.c
+++ b/testing/testing_zsyrk.c
@@ -23,7 +23,6 @@
 int
 testing_zsyrk( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am, An;
     int          hres = 0;
     CHAM_desc_t *descA, *descC, *descCinit;
@@ -95,7 +94,6 @@ testing_zsyrk( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zsysv.c b/testing/testing_zsysv.c
index d208edfaf09c24bb33ccaa71be50924f7f4c26a0..0b5022a806687b1fb15aaa0f71658142cebe5b29 100644
--- a/testing/testing_zsysv.c
+++ b/testing/testing_zsysv.c
@@ -30,7 +30,6 @@ flops_zsysv( int N, int NRHS )
 int
 testing_zsysv( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descX;
 
@@ -92,7 +91,6 @@ testing_zsysv( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descX );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zsytrf.c b/testing/testing_zsytrf.c
index 5f3b3101166b2b1f6d8b850ad8c51790fc48ab8d..d47c98a66ae684005327e2ed3c610bfd721d3a85 100644
--- a/testing/testing_zsytrf.c
+++ b/testing/testing_zsytrf.c
@@ -23,7 +23,6 @@
 int
 testing_zsytrf( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA;
 
@@ -67,7 +66,6 @@ testing_zsytrf( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zsytrs.c b/testing/testing_zsytrs.c
index a1e313b1185a0357a0f35439605db60bdfede2cf..4c7c9c8a34fd891781b5fd87d55aac0199580b66 100644
--- a/testing/testing_zsytrs.c
+++ b/testing/testing_zsytrs.c
@@ -24,7 +24,6 @@
 int
 testing_zsytrs( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres;
     CHAM_desc_t *descA, *descX;
 
@@ -82,7 +81,6 @@ testing_zsytrs( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descX );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_ztradd.c b/testing/testing_ztradd.c
index cee58ae83c50e2135739607f1b661ed587199d24..1dc329ad32db9425a11a8fa57e3e3c17d8855124 100644
--- a/testing/testing_ztradd.c
+++ b/testing/testing_ztradd.c
@@ -50,7 +50,6 @@ flops_ztradd( cham_uplo_t uplo, int M, int N )
 int
 testing_ztradd( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     int          Am, An;
     CHAM_desc_t *descA, *descB;
@@ -138,7 +137,6 @@ testing_ztradd( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descB );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_ztrmm.c b/testing/testing_ztrmm.c
index 86a44b189e92f3a4044be9d5554b827b39126d9f..12caaffeb0936316b0dd5621ff4f2b74b057b3d7 100644
--- a/testing/testing_ztrmm.c
+++ b/testing/testing_ztrmm.c
@@ -23,7 +23,6 @@
 int
 testing_ztrmm( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Bm, Bn;
     int          hres = 0;
     CHAM_desc_t *descA, *descB, *descBinit;
@@ -92,7 +91,6 @@ testing_ztrmm( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descB );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_ztrsm.c b/testing/testing_ztrsm.c
index 7b6c1940479df0d6769bcaa2b5e0b1176ac849fe..1fc4273e9bff99ebb59d444d25a98d4775f56590 100644
--- a/testing/testing_ztrsm.c
+++ b/testing/testing_ztrsm.c
@@ -23,7 +23,6 @@
 int
 testing_ztrsm( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres = 0;
     CHAM_desc_t *descA, *descB, *descBinit;
 
@@ -83,7 +82,6 @@ testing_ztrsm( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descA );
     CHAMELEON_Desc_Destroy( &descB );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_ztrtri.c b/testing/testing_ztrtri.c
index 215b3d95790e8cfd33f1da31e557e37f323157a8..49854a9e33a0b8ac3dcd91e224f8f07a2519457f 100644
--- a/testing/testing_ztrtri.c
+++ b/testing/testing_ztrtri.c
@@ -23,7 +23,6 @@
 int
 testing_ztrtri( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA;
 
@@ -68,7 +67,6 @@ testing_ztrtri( run_arg_list_t *args, int check )
 
     CHAMELEON_Desc_Destroy( &descA );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zunglq.c b/testing/testing_zunglq.c
index fb40d2d070079860473a5fd55b2454ec28499aab..22864c2ccf0c8231a73f389a73e47d25cae34d1e 100644
--- a/testing/testing_zunglq.c
+++ b/testing/testing_zunglq.c
@@ -23,7 +23,6 @@
 int
 testing_zunglq( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descT, *descQ;
 
@@ -87,7 +86,6 @@ testing_zunglq( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descT );
     CHAMELEON_Desc_Destroy( &descQ );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zunglq_hqr.c b/testing/testing_zunglq_hqr.c
index b0f2767c568ba1d7a09b2dd11bb17d10c889e537..6b5527ef529e5f6b300ae40cd5a4086f4bc4fecd 100644
--- a/testing/testing_zunglq_hqr.c
+++ b/testing/testing_zunglq_hqr.c
@@ -23,7 +23,6 @@
 int
 testing_zunglq_hqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descTS, *descTT, *descQ;
 
@@ -97,7 +96,6 @@ testing_zunglq_hqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descQ );
     libhqr_finalize( &qrtree );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zungqr.c b/testing/testing_zungqr.c
index 025682f175a27a69faa5641a35f5afa5366a7198..05e38cd56e0346a2e59ed5537cb03e5173f65870 100644
--- a/testing/testing_zungqr.c
+++ b/testing/testing_zungqr.c
@@ -23,7 +23,6 @@
 int
 testing_zungqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descT, *descQ;
 
@@ -87,7 +86,6 @@ testing_zungqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descT );
     CHAMELEON_Desc_Destroy( &descQ );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zungqr_hqr.c b/testing/testing_zungqr_hqr.c
index 0fd7d9f13d2c543992e5c58df6d1c01e72f8808b..850a5a4519ee6d7038a6ef719386e37691a7364c 100644
--- a/testing/testing_zungqr_hqr.c
+++ b/testing/testing_zungqr_hqr.c
@@ -23,7 +23,6 @@
 int
 testing_zungqr_hqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          hres   = 0;
     CHAM_desc_t *descA, *descTS, *descTT, *descQ;
 
@@ -97,7 +96,6 @@ testing_zungqr_hqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descQ );
     libhqr_finalize( &qrtree );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zunmlq.c b/testing/testing_zunmlq.c
index 5508c45323920a0679b38af799c188fd0910fd5c..cd17d466f9a0ea0d7a0409605d9baacfc7d336f5 100644
--- a/testing/testing_zunmlq.c
+++ b/testing/testing_zunmlq.c
@@ -24,7 +24,6 @@
 int
 testing_zunmlq( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          An;
     int          hres;
     CHAM_desc_t *descA, *descT, *descC;
@@ -105,7 +104,6 @@ testing_zunmlq( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descT );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zunmlq_hqr.c b/testing/testing_zunmlq_hqr.c
index 6a56dfc1fa5616ea317c85327ca6d8aa502d05cb..a00808d9098a760986c613efdd38e6a4e26a531b 100644
--- a/testing/testing_zunmlq_hqr.c
+++ b/testing/testing_zunmlq_hqr.c
@@ -24,7 +24,6 @@
 int
 testing_zunmlq_hqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          An;
     int          hres;
     CHAM_desc_t *descA, *descTS, *descTT, *descC;
@@ -115,7 +114,6 @@ testing_zunmlq_hqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descC );
     libhqr_finalize( &qrtree );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zunmqr.c b/testing/testing_zunmqr.c
index 1ae166bde8f693156caaa65de21d6a7a48bc1c0b..e34113f60a7bb35bf0a42a47a11f4efbc00fdc87 100644
--- a/testing/testing_zunmqr.c
+++ b/testing/testing_zunmqr.c
@@ -24,7 +24,6 @@
 int
 testing_zunmqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am;
     int          hres;
     CHAM_desc_t *descA, *descT, *descC;
@@ -105,7 +104,6 @@ testing_zunmqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descT );
     CHAMELEON_Desc_Destroy( &descC );
 
-    run_id++;
     return hres;
 }
 
diff --git a/testing/testing_zunmqr_hqr.c b/testing/testing_zunmqr_hqr.c
index 38bef324f04078a3b32f3a472592eaa5171336ce..0fd785b41d2d566fe392e8751825ed4c5380bfb2 100644
--- a/testing/testing_zunmqr_hqr.c
+++ b/testing/testing_zunmqr_hqr.c
@@ -24,7 +24,6 @@
 int
 testing_zunmqr_hqr( run_arg_list_t *args, int check )
 {
-    static int   run_id = 0;
     int          Am;
     int          hres;
     CHAM_desc_t *descA, *descTS, *descTT, *descC;
@@ -115,7 +114,6 @@ testing_zunmqr_hqr( run_arg_list_t *args, int check )
     CHAMELEON_Desc_Destroy( &descC );
     libhqr_finalize( &qrtree );
 
-    run_id++;
     return hres;
 }