let's add a flag and ifdef

Author: TingDaoK

CMakeLists.txt

@@ -108,6 +108,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
 
 include(CTest)
 if (BUILD_TESTING)
+    add_definitions(-DAWS_C_S3_ENABLE_TEST_STUBS)
     add_subdirectory(tests)
     if (NOT BYO_CRYPTO AND NOT CMAKE_CROSSCOMPILING)
         add_subdirectory(samples)

include/aws/s3/private/s3_client_impl.h

@@ -178,8 +178,10 @@ struct aws_s3_client_vtable {
         struct aws_http_connection *client_connection,
         const struct aws_http_make_request_options *options);
 
+#ifdef AWS_C_S3_ENABLE_TEST_STUBS
     /********************* TEST ONLY STUB **************************/
     void (*after_prepare_upload_part_finish_stub)(struct aws_s3_request *request, struct aws_http_message *message);
+#endif
 };
 
 struct aws_s3_upload_part_timeout_stats {

include/aws/s3/private/s3_meta_request_impl.h

@@ -123,9 +123,11 @@ struct aws_s3_meta_request_vtable {
     /* Pause the given request */
     int (*pause)(struct aws_s3_meta_request *meta_request, struct aws_s3_meta_request_resume_token **resume_token);
 
+#ifdef AWS_C_S3_ENABLE_TEST_STUBS
     /********************* TEST ONLY STUB **************************/
     /* A stub to the update implementation from meta request with the lock held. Only for tests. */
     bool (*synced_update_stub)(struct aws_s3_meta_request *meta_request);
+#endif
 };
 
 /**

source/s3_auto_ranged_get.c

@@ -202,12 +202,14 @@ static bool s_s3_auto_ranged_get_update(
     /* BEGIN CRITICAL SECTION */
     {
         aws_s3_meta_request_lock_synced_data(meta_request);
+
+#ifdef AWS_C_S3_ENABLE_TEST_STUBS
         if (meta_request->vtable->synced_update_stub && meta_request->vtable->synced_update_stub(meta_request)) {
             /* TEST ONLY, allow test to stub here. */
             aws_s3_meta_request_unlock_synced_data(meta_request);
             return true;
         }
-
+#endif
         /* If nothing has set the "finish result" then this meta request is still in progress, and we can potentially
          * send additional requests. */
         if (!aws_s3_meta_request_has_finish_result_synced(meta_request)) {

source/s3_auto_ranged_put.c

@@ -486,11 +486,14 @@ static bool s_s3_auto_ranged_put_update(
     /* BEGIN CRITICAL SECTION */
     {
         aws_s3_meta_request_lock_synced_data(meta_request);
+
+#ifdef AWS_C_S3_ENABLE_TEST_STUBS
         if (meta_request->vtable->synced_update_stub && meta_request->vtable->synced_update_stub(meta_request)) {
             /* TEST ONLY, allow test to stub here. */
             aws_s3_meta_request_unlock_synced_data(meta_request);
             return true;
         }
+#endif
 
         if (!aws_s3_meta_request_has_finish_result_synced(meta_request)) {
             /* If resuming and list part has not been sent, do it now. */
@@ -1253,10 +1256,13 @@ static void s_s3_prepare_upload_part_finish(struct aws_s3_prepare_upload_part_jo
         aws_future_http_message_set_error(part_prep->on_complete, aws_last_error());
         goto on_done;
     }
+
+#ifdef AWS_C_S3_ENABLE_TEST_STUBS
     if (client->vtable->after_prepare_upload_part_finish_stub) {
         /* TEST ONLY, allow test to stub here. */
         client->vtable->after_prepare_upload_part_finish_stub(request, message);
     }
+#endif
 
     /* Success! */
     aws_future_http_message_set_result_by_move(part_prep->on_complete, &message);

source/s3_default_meta_request.c

@@ -160,11 +160,14 @@ static bool s_s3_meta_request_default_update(
     /* BEGIN CRITICAL SECTION */
     {
         aws_s3_meta_request_lock_synced_data(meta_request);
+
+#ifdef AWS_C_S3_ENABLE_TEST_STUBS
         if (meta_request->vtable->synced_update_stub && meta_request->vtable->synced_update_stub(meta_request)) {
             /* TEST ONLY, allow test to stub here. */
             aws_s3_meta_request_unlock_synced_data(meta_request);
             return true;
         }
+#endif
         if (!aws_s3_meta_request_has_finish_result_synced(meta_request)) {
 
             /* If the request hasn't been sent, then create and send it now. */