Merge branch 'master' into levi/cargo-mounting

DataDog · Apr 18, 2024 · 78dec71 · 78dec71
2 parents d91191c + 8180fdb
commit 78dec71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/dockerfiles/verify_packages/installer/test_install_custom_ext_dir_and_ini.sh b/dockerfiles/verify_packages/installer/test_install_custom_ext_dir_and_ini.sh
@@ -8,8 +8,7 @@ set -e
 assert_no_ddtrace
 
 # Install using the php installer
-trace_version="0.99.0"
-generate_installers "${trace_version}"
+trace_version=$(cat VERSION)
 custom_ini_file="$(get_php_conf_dir)/40-ddtrace.ini"
 php ./build/packages/datadog-setup.php --php-bin php --extension-dir /custom-ext-dir --enable-profiling --ini "$custom_ini_file"
 
@@ -19,4 +18,4 @@ assert_ddtrace_version "${trace_version}"
 assert_profiler_installed
 assert_appsec_installed
 
-assert_request_init_hook_exists
+assert_sources_path_exists
diff --git a/dockerfiles/verify_packages/installer/test_install_custom_extension_directory.sh b/dockerfiles/verify_packages/installer/test_install_custom_extension_directory.sh
@@ -8,8 +8,7 @@ set -e
 assert_no_ddtrace
 
 # Install using the php installer
-trace_version="0.99.0"
-generate_installers "${trace_version}"
+trace_version=$(cat VERSION)
 php ./build/packages/datadog-setup.php --php-bin php --extension-dir /custom-ext-dir --enable-profiling
 
 assert_file_exists /custom-ext-dir/ddtrace.so
@@ -18,4 +17,4 @@ assert_ddtrace_version "${trace_version}"
 assert_profiler_installed
 assert_appsec_installed
 
-assert_request_init_hook_exists
+assert_sources_path_exists
diff --git a/dockerfiles/verify_packages/installer/test_install_custom_ini_file.sh b/dockerfiles/verify_packages/installer/test_install_custom_ini_file.sh
@@ -8,13 +8,12 @@ set -e
 assert_no_ddtrace
 
 # Install using the php installer
-trace_version="0.99.0"
-generate_installers "${trace_version}"
+trace_version=$(cat VERSION)
 custom_ini_file="$(get_php_conf_dir)/40-ddtrace.ini"
 php ./build/packages/datadog-setup.php --php-bin php --ini "$custom_ini_file" --enable-profiling
 
 assert_ddtrace_version "${trace_version}"
 assert_profiler_installed
 assert_appsec_installed
 
-assert_request_init_hook_exists
+assert_sources_path_exists