google-cloud-cpp: simplify excluded test list (#291716)
* google-cloud-cpp: simplify excluded test list The upstream project labels any test that requires contacting Google Cloud Platform as an `integration-test`. It is easier to skip the tests by label than explicitly listing each test. * Fix formatting * Update pkgs/development/libraries/google-cloud-cpp/default.nix Co-authored-by: Sandro <sandro.jaeckel@gmail.com> * Fix formatting --------- Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Carlos O'Ryan
GitHub
parent
e928c4631c
commit
db7e0753ff
|
|
@ -28,7 +28,6 @@ let
|
|||
rev = googleapisRev;
|
||||
hash = "sha256-4Qiz0pBgW3OZi+Z8Zq6k9E94+8q6/EFMwPh8eQxDjdI=";
|
||||
};
|
||||
excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-cloud-cpp";
|
||||
|
|
@ -106,16 +105,17 @@ stdenv.mkDerivation rec {
|
|||
lib.optionalString doInstallCheck (
|
||||
lib.optionalString (!staticOnly) ''
|
||||
export ${ldLibraryPathName}=${lib.concatStringsSep ":" additionalLibraryPaths}
|
||||
'' + ''
|
||||
export GTEST_FILTER="-${lib.concatStringsSep ":" excludedTests.cases}"
|
||||
''
|
||||
);
|
||||
|
||||
installCheckPhase = lib.optionalString doInstallCheck ''
|
||||
runHook preInstallCheck
|
||||
|
||||
# disable tests that contact the internet
|
||||
ctest --exclude-regex '^(${lib.concatStringsSep "|" excludedTests.whole})'
|
||||
# Disable any integration tests, which need to contact the internet.
|
||||
# Also disable the `storage_benchmark_*` tests.
|
||||
# With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON.
|
||||
# With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF
|
||||
ctest --label-exclude integration-test --exclude-regex storage_benchmarks_
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,139 +0,0 @@
|
|||
whole = [
|
||||
"common_samples_samples",
|
||||
"common_internal_grpc_impersonate_service_account_integration_test",
|
||||
"common_internal_unified_rest_credentials_integration_test",
|
||||
"iam_samples_iam_credentials_samples",
|
||||
"iam_samples_iam_samples",
|
||||
"iam_admin_v1_samples_iam_client_samples",
|
||||
"iam_credentials_v1_samples_iam_credentials_client_samples",
|
||||
"iam_v1_samples_iam_policy_client_samples",
|
||||
"iam_v2_samples_policies_client_samples",
|
||||
"bigtable_admin_admin_iam_policy_integration_test",
|
||||
"bigtable_bigtable_instance_admin_client_samples",
|
||||
"bigtable_bigtable_table_admin_client_samples",
|
||||
"bigtable_apply_read_latency_benchmark",
|
||||
"bigtable_endurance_benchmark",
|
||||
"bigtable_mutation_batcher_throughput_benchmark",
|
||||
"bigtable_read_sync_vs_async_benchmark",
|
||||
"bigtable_scan_throughput_benchmark",
|
||||
"bigtable_admin_iam_policy_integration_test",
|
||||
"bigtable_data_async_future_integration_test",
|
||||
"bigtable_data_integration_test",
|
||||
"bigtable_filters_integration_test",
|
||||
"bigtable_mutations_integration_test",
|
||||
"bigtable_table_sample_rows_integration_test",
|
||||
"bigquery_samples_bigquery_read_samples",
|
||||
"bigquery_analyticshub_v1_samples_analytics_hub_client_samples",
|
||||
"bigquery_biglake_v1_samples_metastore_client_samples",
|
||||
"bigquery_connection_v1_samples_connection_client_samples",
|
||||
"bigquery_datapolicies_v1_samples_data_policy_client_samples",
|
||||
"bigquery_datatransfer_v1_samples_data_transfer_client_samples",
|
||||
"bigquery_migration_v2_samples_migration_client_samples",
|
||||
"bigquery_reservation_v1_samples_reservation_client_samples",
|
||||
"bigquery_storage_v1_samples_bigquery_read_client_samples",
|
||||
"bigquery_storage_v1_samples_bigquery_write_client_samples",
|
||||
"logging_quickstart",
|
||||
"logging_v2_samples_config_service_v2_client_samples",
|
||||
"logging_v2_samples_logging_service_v2_client_samples",
|
||||
"logging_v2_samples_metrics_service_v2_client_samples",
|
||||
"pubsub_endurance",
|
||||
"pubsub_throughput",
|
||||
"pubsub_subscriber_integration_test",
|
||||
"pubsub_subscription_admin_integration_test",
|
||||
"pubsub_topic_admin_integration_test",
|
||||
"spanner_client_integration_test",
|
||||
"spanner_client_stress_test",
|
||||
"spanner_data_types_integration_test",
|
||||
"spanner_database_admin_integration_test",
|
||||
"spanner_instance_admin_integration_test",
|
||||
"spanner_session_pool_integration_test",
|
||||
"spanner_admin_database_admin_integration_test",
|
||||
"spanner_admin_instance_admin_integration_test",
|
||||
"spanner_database_admin_client_samples",
|
||||
"spanner_instance_admin_client_samples",
|
||||
"spanner_multiple_rows_cpu_benchmark",
|
||||
"spanner_single_row_throughput_benchmark",
|
||||
"storage_alternative_endpoint_integration_test",
|
||||
"storage_auto_finalize_integration_test",
|
||||
"storage_bucket_integration_test",
|
||||
"storage_create_client_integration_test",
|
||||
"storage_curl_sign_blob_integration_test",
|
||||
"storage_decompressive_transcoding_integration_test",
|
||||
"storage_grpc_bucket_acl_integration_test",
|
||||
"storage_grpc_bucket_metadata_integration_test",
|
||||
"storage_grpc_default_object_acl_integration_test",
|
||||
"storage_grpc_integration_test",
|
||||
"storage_grpc_object_acl_integration_test",
|
||||
"storage_grpc_object_media_integration_test",
|
||||
"storage_grpc_object_metadata_integration_test",
|
||||
"storage_key_file_integration_test",
|
||||
"storage_minimal_iam_credentials_rest_integration_test",
|
||||
"storage_object_basic_crud_integration_test",
|
||||
"storage_object_checksum_integration_test",
|
||||
"storage_object_compose_many_integration_test",
|
||||
"storage_object_file_integration_test",
|
||||
"storage_object_hash_integration_test",
|
||||
"storage_object_insert_integration_test",
|
||||
"storage_object_insert_preconditions_integration_test",
|
||||
"storage_object_integration_test",
|
||||
"storage_object_list_objects_versions_integration_test",
|
||||
"storage_object_media_integration_test",
|
||||
"storage_object_parallel_upload_integration_test",
|
||||
"storage_object_plenty_clients_serially_integration_test",
|
||||
"storage_object_plenty_clients_simultaneously_integration_test",
|
||||
"storage_object_read_headers_integration_test",
|
||||
"storage_object_read_preconditions_integration_test",
|
||||
"storage_object_read_range_integration_test",
|
||||
"storage_object_read_stream_integration_test",
|
||||
"storage_object_resumable_parallel_upload_integration_test",
|
||||
"storage_object_resumable_write_integration_test",
|
||||
"storage_object_rewrite_integration_test",
|
||||
"storage_object_write_preconditions_integration_test",
|
||||
"storage_object_write_stream_integration_test",
|
||||
"storage_object_write_streambuf_integration_test",
|
||||
"storage_service_account_integration_test",
|
||||
"storage_signed_url_integration_test",
|
||||
"storage_small_reads_integration_test",
|
||||
"storage_thread_integration_test",
|
||||
"storage_tracing_integration_test",
|
||||
"storage_unified_credentials_integration_test",
|
||||
"storage_aggregate_download_throughput_benchmark",
|
||||
"storage_aggregate_upload_throughput_benchmark",
|
||||
"storage_create_dataset",
|
||||
"storage_storage_file_transfer_benchmark",
|
||||
"storage_storage_parallel_uploads_benchmark",
|
||||
"storage_storage_throughput_vs_cpu_benchmark",
|
||||
"storage_throughput_experiment_test"
|
||||
]
|
||||
cases = [
|
||||
"BackupExtraIntegrationTest.CreateBackupWithExpiredVersionTime",
|
||||
"BackupExtraIntegrationTest.BackupWithExpiredVersionTime",
|
||||
"BackupExtraIntegrationTest.BackupWithFutureVersionTime",
|
||||
"BackupExtraIntegrationTest.CreateBackupWithFutureVersionTime",
|
||||
"BlockingPublisherIntegrationTest.Basic",
|
||||
"DatabaseAdminClientTest.CreateWithEncryptionKey",
|
||||
"DatabaseAdminClientTest.CreateWithNonexistentEncryptionKey",
|
||||
"DatabaseAdminClientTest.DatabaseBasicCRUD",
|
||||
"DatabaseAdminClientTest.VersionRetentionPeriodCreate",
|
||||
"DatabaseAdminClientTest.VersionRetentionPeriodCreateFailure",
|
||||
"DatabaseAdminClientTest.VersionRetentionPeriodUpdate",
|
||||
"DatabaseAdminClientTest.VersionRetentionPeriodUpdateFailure",
|
||||
"ErrorParsingIntegrationTest.FailureContainsErrorInfo",
|
||||
"GrpcServiceAccountIntegrationTest.GetServiceAccount",
|
||||
"GrpcBucketMetadataIntegrationTest.ObjectMetadataCRUD",
|
||||
"InstanceAdminClientTest.InstanceConfig",
|
||||
"InstanceAdminClientTest.InstanceIam",
|
||||
"InstanceAdminClientTest.InstanceReadOperations",
|
||||
"LoggingIntegrationTest.ListMonitoredResourceDescriptors",
|
||||
"LoggingIntegrationTest.WriteLogEntries",
|
||||
"ObjectFileMultiThreadedTest.Download",
|
||||
"ObjectReadLargeIntegrationTest.LimitedMemoryGrowth",
|
||||
"SubscriberIntegrationTest.FireAndForget",
|
||||
"SubscriberIntegrationTest.PublishOrdered",
|
||||
"SubscriberIntegrationTest.PublishPullAck",
|
||||
"SubscriberIntegrationTest.RawStub",
|
||||
"SubscriberIntegrationTest.ReportNotFound",
|
||||
"SubscriberIntegrationTest.StreamingSubscriptionBatchSource",
|
||||
"SubscriptionAdminIntegrationTest.SubscriptionCRUD",
|
||||
"TopicAdminIntegrationTest.TopicCRUD"
|
||||
]
|
||||
Loading…
Reference in New Issue
Block a user