[cbsasl] move saslprep test to the source

And link it into the same binary which tests the string comparison
function in cbsasl to reduce the link time and runtime cost of two
separate binaries which just a handful of tests

Change-Id: Iad87aa960c3cd631a4fddc5d5eca9024694f0362
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/135599
Tested-by: Trond Norbye <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: trondn

cbsasl/CMakeLists.txt

@@ -43,13 +43,12 @@ install(TARGETS cbsasl
 
 # Unit tests
 if (COUCHBASE_KV_BUILD_UNIT_TESTS)
-    add_executable(cbsasl_strcmp_test strcmp_test.cc
-                   strcmp.cc
-                   util.h)
-    target_link_libraries(cbsasl_strcmp_test gtest gtest_main)
-    add_test(NAME cbsasl-strcmp
+    add_executable(cbsasl_utils_test strcmp_test.cc
+                   scram-sha/saslprep_test.cc)
+    target_link_libraries(cbsasl_utils_test cbsasl gtest gtest_main)
+    add_test(NAME cbsasl_utils_test
              WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-             COMMAND cbsasl_strcmp_test)
+             COMMAND cbsasl_utils_test)
 
     add_executable(cbsasl_pwconv_test
                    ${Memcached_SOURCE_DIR}/include/cbcrypto/cbcrypto.h

tests/saslprep/saslprep_test.cc renamed to cbsasl/scram-sha/saslprep_test.cc

@@ -12,7 +12,6 @@ ADD_SUBDIRECTORY(histograms)
 ADD_SUBDIRECTORY(mc_time)
 ADD_SUBDIRECTORY(mcbp)
 ADD_SUBDIRECTORY(memory_tracking_test)
-ADD_SUBDIRECTORY(saslprep)
 ADD_SUBDIRECTORY(scripts_tests)
 ADD_SUBDIRECTORY(sizes)
 ADD_SUBDIRECTORY(testapp)