winpthreads: tests: rename mutex tests

Signed-off-by: Kirill Makurin <maiddaisuki@outlook.com>
Signed-off-by: LIU Hao <lh_mouse@126.com>
diff --git a/mingw-w64-libraries/winpthreads/tests/Makefile.am b/mingw-w64-libraries/winpthreads/tests/Makefile.am
index 0fe236b..4e0b9a1 100644
--- a/mingw-w64-libraries/winpthreads/tests/Makefile.am
+++ b/mingw-w64-libraries/winpthreads/tests/Makefile.am
@@ -110,36 +110,36 @@
 	pthread_misc/stress1       \
 	pthread_misc/valid1        \
 	pthread_misc/valid2        \
-	pthread_mutex/mutex1       \
-	pthread_mutex/mutex1e      \
-	pthread_mutex/mutex1n      \
-	pthread_mutex/mutex1r      \
-	pthread_mutex/mutex2       \
-	pthread_mutex/mutex2e      \
-	pthread_mutex/mutex2r      \
-	pthread_mutex/mutex3       \
-	pthread_mutex/mutex3e      \
-	pthread_mutex/mutex3r      \
-	pthread_mutex/mutex4       \
-	pthread_mutex/mutex4e      \
-	pthread_mutex/mutex4n      \
-	pthread_mutex/mutex4r      \
-	pthread_mutex/mutex5       \
-	pthread_mutex/mutex6       \
-	pthread_mutex/mutex6e      \
-	pthread_mutex/mutex6es     \
-	pthread_mutex/mutex6n      \
-	pthread_mutex/mutex6r      \
-	pthread_mutex/mutex6rs     \
-	pthread_mutex/mutex6s      \
-	pthread_mutex/mutex7       \
-	pthread_mutex/mutex7e      \
-	pthread_mutex/mutex7n      \
-	pthread_mutex/mutex7r      \
-	pthread_mutex/mutex8       \
-	pthread_mutex/mutex8e      \
-	pthread_mutex/mutex8n      \
-	pthread_mutex/mutex8r      \
+	pthread_mutex/default-basic                    \
+	pthread_mutex/default-lock-recursive           \
+	pthread_mutex/default-static                   \
+	pthread_mutex/default-static-lock-recursive    \
+	pthread_mutex/default-timedlock                \
+	pthread_mutex/default-trylock                  \
+	pthread_mutex/default-trylock-recursive        \
+	pthread_mutex/default-unlock                   \
+	pthread_mutex/errorcheck-basic                 \
+	pthread_mutex/errorcheck-lock-recursive        \
+	pthread_mutex/errorcheck-static                \
+	pthread_mutex/errorcheck-static-lock-recursive \
+	pthread_mutex/errorcheck-timedlock             \
+	pthread_mutex/errorcheck-trylock               \
+	pthread_mutex/errorcheck-trylock-recursive     \
+	pthread_mutex/errorcheck-unlock                \
+	pthread_mutex/mutex-types                      \
+	pthread_mutex/normal-basic                     \
+	pthread_mutex/normal-lock-recursive            \
+	pthread_mutex/normal-timedlock                 \
+	pthread_mutex/normal-trylock-recursive         \
+	pthread_mutex/normal-unlock                    \
+	pthread_mutex/recursive-basic                  \
+	pthread_mutex/recursive-lock-recursive         \
+	pthread_mutex/recursive-static                 \
+	pthread_mutex/recursive-static-lock-recursive  \
+	pthread_mutex/recursive-timedlock              \
+	pthread_mutex/recursive-trylock                \
+	pthread_mutex/recursive-trylock-recursive      \
+	pthread_mutex/recursive-unlock                 \
 	pthread_once/once1         \
 	pthread_once/once2         \
 	pthread_once/once3         \
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex1.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-basic.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex1.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-basic.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-lock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-lock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6s.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-static-lock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6s.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-static-lock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-static.c
similarity index 94%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-static.c
index f0d35ff..987df75 100644
--- a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2.c
+++ b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-static.c
@@ -33,8 +33,8 @@
 /**
  * Test Summary:
  *
- * This test is equivalent to `mutex1.c`, except it uses statically initialized
- * `pthread_mutex_t` object.
+ * This test is equivalent to `default-basic.c`, except it uses statically
+ * initialized `pthread_mutex_t` object.
  */
 
 int main(void)
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex8.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-timedlock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex8.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-timedlock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex7.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-trylock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex7.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-trylock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex3.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-trylock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex3.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-trylock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex4.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-unlock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex4.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/default-unlock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex1e.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-basic.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex1e.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-basic.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6e.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-lock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6e.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-lock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6es.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-static-lock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6es.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-static-lock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2e.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-static.c
similarity index 93%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2e.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-static.c
index 64716a4..a445bd4 100644
--- a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2e.c
+++ b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-static.c
@@ -33,8 +33,8 @@
 /**
  * Test Summary:
  *
- * This test is equivalent to `mutex1e.c`, except it uses statically initialized
- * `pthread_mutex_t` object.
+ * This test is equivalent to `errorcheck-basic.c`, except it uses statically
+ * initialized `pthread_mutex_t` object.
  */
 
 int main(void)
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex8e.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-timedlock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex8e.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-timedlock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex7e.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-trylock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex7e.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-trylock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex3e.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-trylock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex3e.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-trylock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex4e.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-unlock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex4e.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/errorcheck-unlock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex5.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex-types.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex5.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex-types.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex1n.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-basic.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex1n.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-basic.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6n.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-lock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6n.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-lock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex8n.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-timedlock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex8n.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-timedlock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex7n.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-trylock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex7n.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-trylock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex4n.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-unlock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex4n.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/normal-unlock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex1r.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-basic.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex1r.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-basic.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6r.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-lock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6r.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-lock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6rs.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-static-lock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex6rs.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-static-lock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2r.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-static.c
similarity index 94%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2r.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-static.c
index 507f514..36ddc9b 100644
--- a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex2r.c
+++ b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-static.c
@@ -33,8 +33,8 @@
 /**
  * Test Summary:
  *
- * This test is equivalent to `mutex1r.c`, except it uses statically initialized
- * `pthread_mutex_t` object.
+ * This test is equivalent to `recursive-basic.c`, except it uses statically
+ * initialized `pthread_mutex_t` object.
  */
 
 int main(void)
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex8r.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-timedlock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex8r.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-timedlock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex7r.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-trylock-recursive.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex7r.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-trylock-recursive.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex3r.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-trylock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex3r.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-trylock.c
diff --git a/mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex4r.c b/mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-unlock.c
similarity index 100%
rename from mingw-w64-libraries/winpthreads/tests/pthread_mutex/mutex4r.c
rename to mingw-w64-libraries/winpthreads/tests/pthread_mutex/recursive-unlock.c