Merge pull request #2129 from krzycz/test_fix_timeouts

test: fix timeout in obj_async_postcommit
pmem · Jul 17, 2017 · 1791644 · 1791644
2 parents 6897bd5 + 797ae7b
commit 1791644
Show file tree

Hide file tree

Showing 28 changed files with 39 additions and 29 deletions.
diff --git a/src/test/obj_async_postcommit/TEST0 b/src/test/obj_async_postcommit/TEST0
@@ -38,7 +38,7 @@ export UNITTEST_NUM=0
 . ../unittest/unittest.sh
 
 require_test_type medium
-require_fs_type any
+require_fs_type pmem
 
 setup
 

diff --git a/src/test/obj_async_postcommit/TEST0.PS1 b/src/test/obj_async_postcommit/TEST0.PS1
@@ -44,8 +44,8 @@ $ENV:UNITTEST_NUM = "0"
 # standard unit test setup
 . ..\unittest\unittest.ps1
 
-require_test_type short
-require_fs_type any
+require_test_type medium
+require_fs_type pmem
 
 setup
 

diff --git a/src/test/obj_convert/TEST0 b/src/test/obj_convert/TEST0
@@ -40,6 +40,7 @@ export UNITTEST_NUM=0
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST1 b/src/test/obj_convert/TEST1
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright 2016, Intel Corporation
+# Copyright 2016-2017, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -40,8 +40,8 @@ export UNITTEST_NUM=1
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
-
 require_fs_type any
 
 setup

diff --git a/src/test/obj_convert/TEST11 b/src/test/obj_convert/TEST11
@@ -40,6 +40,7 @@ export UNITTEST_NUM=11
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST12 b/src/test/obj_convert/TEST12
@@ -40,6 +40,7 @@ export UNITTEST_NUM=12
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST13 b/src/test/obj_convert/TEST13
@@ -40,6 +40,7 @@ export UNITTEST_NUM=13
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type long
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST14 b/src/test/obj_convert/TEST14
@@ -40,6 +40,7 @@ export UNITTEST_NUM=14
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST15 b/src/test/obj_convert/TEST15
@@ -40,6 +40,7 @@ export UNITTEST_NUM=15
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST16 b/src/test/obj_convert/TEST16
@@ -40,6 +40,7 @@ export UNITTEST_NUM=16
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST17 b/src/test/obj_convert/TEST17
@@ -40,6 +40,7 @@ export UNITTEST_NUM=17
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type long
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST18 b/src/test/obj_convert/TEST18
@@ -40,6 +40,7 @@ export UNITTEST_NUM=18
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST19 b/src/test/obj_convert/TEST19
@@ -40,6 +40,7 @@ export UNITTEST_NUM=19
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type long
 
 # must be non-static debug release of the binary because the test relies on the

diff --git a/src/test/obj_convert/TEST2 b/src/test/obj_convert/TEST2
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright 2016, Intel Corporation
+# Copyright 2016-2017, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -40,8 +40,8 @@ export UNITTEST_NUM=2
 # standard unit test setup
 . ../unittest/unittest.sh
 
+require_command gdb
 require_test_type medium
-
 require_fs_type any
 
 setup

diff --git a/src/test/obj_convert/TEST3 b/src/test/obj_convert/TEST3
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright 2015-2016, Intel Corporation
+# Copyright 2015-2017, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -43,8 +43,8 @@ export UNITTEST_NUM=3
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
+require_command gdb
 require_test_type medium
-
 require_build_type debug
 require_fs_type non-pmem
 

diff --git a/src/test/obj_convert/TEST4 b/src/test/obj_convert/TEST4
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright 2015-2016, Intel Corporation
+# Copyright 2015-2017, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -43,8 +43,8 @@ export UNITTEST_NUM=4
 LOG=out${UNITTEST_NUM}.log
 rm -rf $LOG && touch $LOG
 
+require_command gdb
 require_test_type medium
-
 require_build_type debug
 require_fs_type non-pmem
 

diff --git a/src/test/obj_pvector/TEST0 b/src/test/obj_pvector/TEST0
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright 2015-2016, Intel Corporation
+# Copyright 2015-2017, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -41,6 +41,7 @@ export UNITTEST_NUM=0
 . ../unittest/unittest.sh
 
 require_test_type medium
+require_fs_type pmem
 
 setup
 

diff --git a/src/test/obj_pvector/TEST0.PS1 b/src/test/obj_pvector/TEST0.PS1
@@ -45,8 +45,7 @@ $ENV:UNITTEST_NUM = "0"
 . ..\unittest\unittest.ps1
 
 require_test_type medium
-
-require_fs_type any
+require_fs_type pmem
 
 setup
 

diff --git a/src/test/pmempool_info/out10.log.match b/src/test/pmempool_info/out10.log.match
@@ -23,7 +23,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)

diff --git a/src/test/pmempool_info/out11.log.match b/src/test/pmempool_info/out11.log.match
@@ -23,7 +23,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)

diff --git a/src/test/pmempool_info/out12.log.match b/src/test/pmempool_info/out12.log.match
@@ -23,7 +23,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)

diff --git a/src/test/pmempool_info/out13.log.match b/src/test/pmempool_info/out13.log.match
@@ -23,7 +23,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)

diff --git a/src/test/pmempool_info/out14.log.match b/src/test/pmempool_info/out14.log.match
@@ -23,7 +23,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)
@@ -148,7 +148,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)
@@ -196,7 +196,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)
@@ -244,7 +244,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)

diff --git a/src/test/pmempool_info/out15.log.match b/src/test/pmempool_info/out15.log.match
@@ -23,7 +23,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)
@@ -58,7 +58,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)

diff --git a/src/test/pmempool_info/out16.log.match b/src/test/pmempool_info/out16.log.match
@@ -126,7 +126,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)

diff --git a/src/test/pmempool_info/out16w.log.match b/src/test/pmempool_info/out16w.log.match
@@ -126,7 +126,7 @@ Machine                  : $(*)
 Checksum                 : $(*) [OK]
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(*)
 Number of lanes          : $(*)
 Heap offset              : $(*)

diff --git a/src/test/pmempool_info/out18.log.match b/src/test/pmempool_info/out18.log.match
@@ -26,7 +26,7 @@ Machine                  : AMD X86-64
 Checksum                 : $(*)
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(nW)
 Number of lanes          : $(nW)
 Heap offset              : $(nW)
@@ -58,7 +58,7 @@ Machine                  : AMD X86-64
 Checksum                 : $(*)
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(nW)
 Number of lanes          : $(nW)
 Heap offset              : $(nW)

diff --git a/src/test/pmempool_info/out19.log.match b/src/test/pmempool_info/out19.log.match
@@ -30,7 +30,7 @@ Machine                  : AMD X86-64
 Checksum                 : $(*)
 
 PMEM OBJ Header:
-Layout                   : pmempool😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋
+Layout                   : pmempool$(*)
 Lanes offset             : $(nW)
 Number of lanes          : $(nW)
 Heap offset              : $(nW)