make with USE_GCP=1 and without USE_AWS=1 work properly

Author: githubzilla

cloud/cloud_file_system.cc

@@ -485,11 +485,13 @@ int DoRegisterCloudObjects(ObjectLibrary& library, std::string const& arg) {
       });
   count++;
 
-  count += CloudFileSystemImpl::RegisterAwsObjects(library, arg);
-#ifdef USE_GCP // Only register GCP if we have it
+#ifdef USE_GCP
   count += CloudFileSystemImpl::RegisterGcpObjects(library, arg);
 #endif
 
+#ifdef USE_AWS
+  count += CloudFileSystemImpl::RegisterAwsObjects(library, arg);
+
   // Register the Cloud Log Controllers
 
   library.AddFactory<CloudLogController>(
@@ -503,6 +505,7 @@ int DoRegisterCloudObjects(ObjectLibrary& library, std::string const& arg) {
         return guard->get();
       });
   count++;
+#endif
 
   return count;
 }

cloud/cloud_file_system_test.cc

@@ -1,4 +1,7 @@
 // Copyright (c) 2017 Rockset
+#ifndef ROCKSDB_LITE
+
+#ifdef USE_AWS
 
 #include "rocksdb/cloud/cloud_file_system.h"
 
@@ -247,3 +250,25 @@ int main(int argc, char** argv) {
   Aws::InitAPI(Aws::SDKOptions());
   return RUN_ALL_TESTS();
 }
+
+#else  // USE_AWS
+
+#include <stdio.h>
+
+int main(int, char**) {
+  fprintf(stderr,
+          "SKIPPED as DBCloud is supported only when USE_AWS is defined.\n");
+  return 0;
+}
+#endif  // USE_AWS
+
+#else  // ROCKSDB_LITE
+
+#include <stdio.h>
+
+int main(int, char**) {
+  fprintf(stderr, "SKIPPED as DBCloud is not supported in ROCKSDB_LITE\n");
+  return 0;
+}
+
+#endif  // ROCKSDB_LITE

cloud/gcp/gcp_db_cloud_test.cc

@@ -78,9 +78,6 @@ class CloudTest : public testing::Test {
   void Cleanup() {
     ASSERT_TRUE(!aenv_);
 
-    // check cloud credentials
-    ASSERT_TRUE(cloud_fs_options_.credentials.HasValid().ok());
-
     CloudFileSystem* afs;
     // create a dummy Gcp env
     ASSERT_OK(CloudFileSystem::NewGcpFileSystem(base_env_->GetFileSystem(),
@@ -183,8 +180,6 @@ class CloudTest : public testing::Test {
 
   void OpenWithColumnFamilies(const std::vector<std::string>& cfs,
                               std::vector<ColumnFamilyHandle*>* handles) {
-    ASSERT_TRUE(cloud_fs_options_.credentials.HasValid().ok());
-
     // Create new Gcp env
     CreateCloudEnv();
     options_.env = aenv_.get();