Merge pull request #1110 from igchor/weekly_fix

Weekly fixes

Author: lukaszstolarczuk

.github/workflows/weekly.yml

@@ -24,8 +24,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        CONFIG: ["TYPE=debug OS=ubuntu OS_VER=20.04 TESTS_USAN=1",
-                 "TYPE=debug OS=ubuntu OS_VER=20.04 TESTS_UBSAN=1",
+        CONFIG: ["TYPE=debug OS=ubuntu OS_VER=20.04 TESTS_USAN=1 TESTS_PMREORDER=0",
+                 "TYPE=debug OS=ubuntu OS_VER=20.04 TESTS_UBSAN=1 TESTS_PMREORDER=0",
                  "TYPE=valgrind OS=fedora OS_VER=rawhide TESTS_PMREORDER=0",
                  "TYPE=memcheck_drd OS=fedora OS_VER=rawhide TESTS_PMREORDER=0",
                  "TYPE=package OS=fedora OS_VER=34",

tests/CMakeLists.txt

@@ -970,23 +970,23 @@ if(TEST_MPSC_QUEUE)
 	add_test_generic(NAME mpsc_queue_consume_multipass TRACERS none memcheck pmemcheck)
 
 	build_test(mpsc_queue_basic mpsc_queue/basic.cpp)
-	add_test_generic(NAME mpsc_queue_basic SCRIPT mpsc_queue/mpsc_queue_basic_0.cmake TRACERS none memcheck pmemcheck)
+	add_test_generic(NAME mpsc_queue_basic SCRIPT mpsc_queue/basic.cmake TRACERS none memcheck pmemcheck)
 
 	build_test(mpsc_queue_empty mpsc_queue/empty.cpp)
 	add_test_generic(NAME mpsc_queue_empty TRACERS none memcheck pmemcheck)
 
 	build_test(mpsc_queue_recovery_order mpsc_queue/recovery_order.cpp)
-	add_test_generic(NAME mpsc_queue_recovery_order SCRIPT mpsc_queue/mpsc_queue_recovery_order.cmake TRACERS none memcheck pmemcheck)
+	add_test_generic(NAME mpsc_queue_recovery_order SCRIPT mpsc_queue/recovery_order.cmake TRACERS none memcheck pmemcheck)
 
 	if(PMREORDER_SUPPORTED)
-		build_test(mpsc_queue_recovery mpsc_queue/recovery.cpp)
-		add_test_generic(NAME mpsc_queue_recovery CASE 0 SCRIPT mpsc_queue/recovery_0.cmake TRACERS none)
-		add_test_generic(NAME mpsc_queue_recovery CASE 1 SCRIPT mpsc_queue/recovery_1.cmake TRACERS none)
-		add_test_generic(NAME mpsc_queue_recovery CASE 2 SCRIPT mpsc_queue/recovery_2.cmake TRACERS none)
-		add_test_generic(NAME mpsc_queue_recovery CASE 3 SCRIPT mpsc_queue/recovery_3.cmake TRACERS none)
-
-		build_test(mpsc_queue_recovery_after_consume mpsc_queue/recovery_after_consume.cpp)
-		add_test_generic(NAME mpsc_queue_recovery_after_consume SCRIPT mpsc_queue/recovery_after_consume_0.cmake TRACERS none)
+		build_test(mpsc_queue_recovery_pmreorder mpsc_queue/pmreorder/recovery.cpp)
+		add_test_generic(NAME mpsc_queue_recovery_pmreorder CASE 0 SCRIPT mpsc_queue/pmreorder/recovery_0.cmake TRACERS none)
+		add_test_generic(NAME mpsc_queue_recovery_pmreorder CASE 1 SCRIPT mpsc_queue/pmreorder/recovery_1.cmake TRACERS none)
+		add_test_generic(NAME mpsc_queue_recovery_pmreorder CASE 2 SCRIPT mpsc_queue/pmreorder/recovery_2.cmake TRACERS none)
+		add_test_generic(NAME mpsc_queue_recovery_pmreorder CASE 3 SCRIPT mpsc_queue/pmreorder/recovery_3.cmake TRACERS none)
+
+		build_test(mpsc_queue_recovery_after_consume_pmreorder mpsc_queue/pmreorder/recovery_after_consume.cpp)
+		add_test_generic(NAME mpsc_queue_recovery_after_consume_pmreorder SCRIPT mpsc_queue/pmreorder/recovery_after_consume.cmake TRACERS none)
 	endif()
 endif()
 ################################################################################

tests/external/libcxx/array/array.cons/copy_assignment.fail.cpp

@@ -70,6 +70,8 @@ test(int argc, char *argv[])
 	}
 
 	run(pop);
+
+	pop.close();
 }
 
 int

tests/external/libcxx/array/array.cons/default.pass.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Copyright 2018-2020, Intel Corporation
+// Copyright 2018-2021, Intel Corporation
 //
 // Modified to test pmem::obj containers
 //
@@ -112,6 +112,8 @@ test(int argc, char *argv[])
 	}
 
 	run(pop);
+
+	pop.close();
 }
 
 int

tests/external/libcxx/array/array.cons/implicit_copy.pass.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Copyright 2018-2020, Intel Corporation
+// Copyright 2018-2021, Intel Corporation
 //
 // Modified to test pmem::obj containers
 //
@@ -175,6 +175,8 @@ test(int argc, char *argv[])
 	}
 
 	run(pop);
+
+	pop.close();
 }
 
 int

tests/external/libcxx/array/array.cons/initializer_list.pass.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Copyright 2018-2020, Intel Corporation
+// Copyright 2018-2021, Intel Corporation
 //
 // Modified to test pmem::obj containers
 //
@@ -124,6 +124,8 @@ test(int argc, char *argv[])
 	}
 
 	run(pop);
+
+	pop.close();
 }
 
 int

tests/external/libcxx/array/array.data/data.pass.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Copyright 2018-2020, Intel Corporation
+// Copyright 2018-2021, Intel Corporation
 //
 // Modified to test pmem::obj containers
 //
@@ -124,6 +124,8 @@ test(int argc, char *argv[])
 	}
 
 	run(pop);
+
+	pop.close();
 }
 
 int

tests/external/libcxx/array/array.data/data_const.pass.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Copyright 2018-2020, Intel Corporation
+// Copyright 2018-2021, Intel Corporation
 //
 // Modified to test pmem::obj containers
 //
@@ -110,6 +110,8 @@ test(int argc, char *argv[])
 	}
 
 	run(pop);
+
+	pop.close();
 }
 
 int

tests/external/libcxx/array/array.fill/fill.pass.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Copyright 2018-2020, Intel Corporation
+// Copyright 2018-2021, Intel Corporation
 //
 // Modified to test pmem::obj containers
 //
@@ -91,6 +91,8 @@ test(int argc, char *argv[])
 	}
 
 	run(pop);
+
+	pop.close();
 }
 
 int

tests/external/libcxx/array/array.size/size.pass.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Copyright 2018-2020, Intel Corporation
+// Copyright 2018-2021, Intel Corporation
 //
 // Modified to test pmem::obj containers
 //
@@ -90,6 +90,8 @@ test(int argc, char *argv[])
 	}
 
 	run(pop);
+
+	pop.close();
 }
 
 int