Index: MultiSource/UnitTests/C++11/CMakeLists.txt
===================================================================
--- MultiSource/UnitTests/C++11/CMakeLists.txt
+++ MultiSource/UnitTests/C++11/CMakeLists.txt
@@ -1,5 +1,6 @@
 list(APPEND CPPFLAGS -std=c++11)
+# Disable frame_layout test on Mips16
 string(FIND "${MIPSARCH}" "mips16" TMP1)
-if("" STREQUAL "${TMP1}")
+if("${TMP1}" EQUAL -1)
   llvm_add_subdirectories(frame_layout)
 endif()
Index: MultiSource/UnitTests/Mips/CMakeLists.txt
===================================================================
--- MultiSource/UnitTests/Mips/CMakeLists.txt
+++ MultiSource/UnitTests/Mips/CMakeLists.txt
@@ -1,4 +1,5 @@
+# Add special tests for mips16
 string(FIND "${MIPSARCH}" "mips16" TMP1)
-if("" STREQUAL "${TMP1}")
+if("${TMP1}" GREATER -1)
   llvm_add_subdirectories(Mips16)
 endif()
Index: SingleSource/UnitTests/CMakeLists.txt
===================================================================
--- SingleSource/UnitTests/CMakeLists.txt
+++ SingleSource/UnitTests/CMakeLists.txt
@@ -21,8 +21,9 @@
 endif()
 if("${ARCH}" STREQUAL "Mips")
   llvm_add_subdirectories(Mips)
+  # Only MIPS 64-bit supports 8 bytes atomic operations.
   string(FIND "${MIPSARCH}" "mips64" TMP2)
-  if("" STREQUAL "${TMP2}")
+  if("${TMP2}" EQUAL -1)
     list(APPEND PROGRAMS_TO_SKIP AtomicOps)
   endif()
 endif()
Index: SingleSource/UnitTests/Mips/CMakeLists.txt
===================================================================
--- SingleSource/UnitTests/Mips/CMakeLists.txt
+++ SingleSource/UnitTests/Mips/CMakeLists.txt
@@ -1,4 +1,5 @@
+# Add special tests for mips16
 string(FIND "${MIPSARCH}" "mips16" TMP1)
-if(NOT "" STREQUAL "${TMP1}")
+if("${TMP1}" GREATER -1)
   llvm_add_subdirectories(Mips16)
 endif()