On i386, pthread ids are 8 hexdigits. Adjust cli tests.

diff --git a/src/test/cli/monmaptool/add-exists.t b/src/test/cli/monmaptool/add-exists.t
index 5ea31af704a81b30a089384a86b4a70a03fe409d..5537234e948180d81f8f0df80e27b12ef635f4b6 100644 (file)
--- a/src/test/cli/monmaptool/add-exists.t
+++ b/src/test/cli/monmaptool/add-exists.t
@@ -1,7 +1,7 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open mymonmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (0 monitors)
 

diff --git a/src/test/cli/monmaptool/add-many.t b/src/test/cli/monmaptool/add-many.t
index 1c75c8946f23350bac6f13b71db572dfa411274e..52a0137970d7e6f9740796394a6dbbf07038ae65 100644 (file)
--- a/src/test/cli/monmaptool/add-many.t
+++ b/src/test/cli/monmaptool/add-many.t
@@ -1,7 +1,7 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open mymonmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (0 monitors)
 

diff --git a/src/test/cli/monmaptool/clobber.t b/src/test/cli/monmaptool/clobber.t
index 1bb27a7c2b33396567d995a7f9ac8cea8a2c5850..34dd9952c3f4db740e4ede97c116f20db48d0e66 100644 (file)
--- a/src/test/cli/monmaptool/clobber.t
+++ b/src/test/cli/monmaptool/clobber.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open mymonmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (1 monitors)
 

diff --git a/src/test/cli/monmaptool/create-print.t b/src/test/cli/monmaptool/create-print.t
index e8aca1012da6b32405b9926eebb539cb2c3e24b5..186f08ee6182e2c6db669ef09f008bfb20e043b9 100644 (file)
--- a/src/test/cli/monmaptool/create-print.t
+++ b/src/test/cli/monmaptool/create-print.t
@@ -1,7 +1,7 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open mymonmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (0 monitors)
 

diff --git a/src/test/cli/monmaptool/create-with-add.t b/src/test/cli/monmaptool/create-with-add.t
index e944905a666ae3dceeddd35ed0f239e7ec1dbfe8..f710f9d4d3e3860b7b1780736df391c50c356354 100644 (file)
--- a/src/test/cli/monmaptool/create-with-add.t
+++ b/src/test/cli/monmaptool/create-with-add.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open mymonmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (1 monitors)
 

diff --git a/src/test/cli/monmaptool/help.t b/src/test/cli/monmaptool/help.t
index 8b54aa23524ecb4ed570d82c6d6e6c1c5b283ff9..739ccf7339d20d90bb4ebb29728b820095867cc0 100644 (file)
--- a/src/test/cli/monmaptool/help.t
+++ b/src/test/cli/monmaptool/help.t
@@ -2,6 +2,6 @@
   $ monmaptool --help
   monmaptool: monmap file --help
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open --help: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open --help: error 2: No such file or directory (re)
   monmaptool: couldn't open --help: Is a directory
   [255]

diff --git a/src/test/cli/monmaptool/print-nonexistent.t b/src/test/cli/monmaptool/print-nonexistent.t
index 46fd04b73447912947066d8732312bed463ae786..afc53e1e7970001c5d83cd22570192415c5858c0 100644 (file)
--- a/src/test/cli/monmaptool/print-nonexistent.t
+++ b/src/test/cli/monmaptool/print-nonexistent.t
@@ -1,6 +1,6 @@
   $ monmaptool --print nonexistent
   monmaptool: monmap file nonexistent
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open nonexistent: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open nonexistent: error 2: No such file or directory (re)
   monmaptool: couldn't open nonexistent: Is a directory
   [255]

diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t
index 183b83e7937ebf491394e45d4255ccb9f00e3f32..ce86164f491b1d0eb1a831a829d380f6b97f93a8 100644 (file)
--- a/src/test/cli/monmaptool/rm-nonexistent.t
+++ b/src/test/cli/monmaptool/rm-nonexistent.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open mymonmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (1 monitors)
 

diff --git a/src/test/cli/monmaptool/rm.t b/src/test/cli/monmaptool/rm.t
index 8e7a1e0733a99f4943983796a68c58f70c27e024..b12a89127bcfe324fe7e08c16d33f47c152d99d8 100644 (file)
--- a/src/test/cli/monmaptool/rm.t
+++ b/src/test/cli/monmaptool/rm.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   failed to open log file '/var/log/ceph/': error 21: Is a directory
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open mymonmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open mymonmap: error 2: No such file or directory (re)
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   monmaptool: writing epoch 1 to mymonmap (1 monitors)
 

diff --git a/src/test/cli/osdmaptool/clobber.t b/src/test/cli/osdmaptool/clobber.t
index b045725e6fada8b34a2b37db05125a4c3025a8f6..12b836cf40fafc40fb3c7d9e4d664da98aadbb0f 100644 (file)
--- a/src/test/cli/osdmaptool/clobber.t
+++ b/src/test/cli/osdmaptool/clobber.t
@@ -1,7 +1,7 @@
 # TODO it seems osdmaptool refuses to create files at all without --clobber
   $ osdmaptool --createsimple 3 myosdmap
   osdmaptool: osdmap file 'myosdmap'
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open myosdmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open myosdmap: error 2: No such file or directory (re)
   osdmaptool: couldn't open myosdmap: error 2: No such file or directory
   [255]
 

diff --git a/src/test/cli/osdmaptool/create-print.t b/src/test/cli/osdmaptool/create-print.t
index c4879515d45bc3925a89f5cc00ad1199ab4db092..bdbca7feb88a920b1c9461897aa9b2cea350dd2d 100644 (file)
--- a/src/test/cli/osdmaptool/create-print.t
+++ b/src/test/cli/osdmaptool/create-print.t
@@ -1,7 +1,7 @@
 # TODO it seems osdmaptool refuses to create files at all without --clobber
   $ osdmaptool --createsimple 3 myosdmap
   osdmaptool: osdmap file 'myosdmap'
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open myosdmap: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open myosdmap: error 2: No such file or directory (re)
   osdmaptool: couldn't open myosdmap: error 2: No such file or directory
   [255]
 

diff --git a/src/test/cli/osdmaptool/print-nonexistent.t b/src/test/cli/osdmaptool/print-nonexistent.t
index bbbe3b93891fd9d6d98d1b3d0549dd798dc71756..1e3672b45d5489ed90693ee890cd1ca58d576fb4 100644 (file)
--- a/src/test/cli/osdmaptool/print-nonexistent.t
+++ b/src/test/cli/osdmaptool/print-nonexistent.t
@@ -1,5 +1,5 @@
   $ osdmaptool --print nonexistent
   osdmaptool: osdmap file 'nonexistent'
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open nonexistent: error 2: No such file or directory (re)
+  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open nonexistent: error 2: No such file or directory (re)
   osdmaptool: couldn't open nonexistent: error 2: No such file or directory
   [255]