Merge pull request ceph#38272 from vbashkirtsev/master

test/test_arch.cc: search "pni" in CPU flags also when detecting SSE3 Reviewed-by: Kefu Chai <[email protected]>
JiYou · Jan 9, 2021 · 0da007a · 0da007a
2 parents b5fd5b5 + b951696
commit 0da007a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/do_cmake.sh b/do_cmake.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 set -ex
 
-git submodule update --init --recursive
+if [ -d .git ]; then
+    git submodule update --init --recursive
+fi
 
 : ${BUILD_DIR:=build}
 : ${CEPH_GIT_DIR:=..}

diff --git a/src/test/test_arch.cc b/src/test/test_arch.cc
@@ -69,7 +69,7 @@ TEST(Arch, all)
   expected = strstr(flags, " sse4_1 ") ? 1 : 0;
   EXPECT_EQ(expected, ceph_arch_intel_sse41);
 
-  expected = (strstr(flags, " sse3 ") || strstr(flags, " ssse3 ")) ? 1 : 0;
+  expected = (strstr(flags, " sse3 ") || strstr(flags, " ssse3 ") || strstr(flags, " pni ")) ? 1 : 0;
   EXPECT_EQ(expected, ceph_arch_intel_sse3);
 
   expected = strstr(flags, " ssse3 ") ? 1 : 0;