aboutsummaryrefslogtreecommitdiff
path: root/src/garage
diff options
context:
space:
mode:
Diffstat (limited to 'src/garage')
-rw-r--r--src/garage/Cargo.toml2
-rw-r--r--src/garage/tests/common/garage.rs8
2 files changed, 3 insertions, 7 deletions
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml
index 82ae1896..d6034bbd 100644
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -8,6 +8,8 @@ description = "Garage, an S3-compatible distributed object store for self-hosted
repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage"
readme = "../../README.md"
+autotests = false
+
[[bin]]
name = "garage"
path = "main.rs"
diff --git a/src/garage/tests/common/garage.rs b/src/garage/tests/common/garage.rs
index e579f03c..97c7a227 100644
--- a/src/garage/tests/common/garage.rs
+++ b/src/garage/tests/common/garage.rs
@@ -179,12 +179,6 @@ index = "index.html"
}
}
-impl Drop for Instance {
- fn drop(&mut self) {
- self.terminate()
- }
-}
-
static mut INSTANCE: MaybeUninit<Instance> = MaybeUninit::uninit();
static INSTANCE_INIT: Once = Once::new();
@@ -192,7 +186,7 @@ static INSTANCE_INIT: Once = Once::new();
extern "C" fn terminate_instance() {
if INSTANCE_INIT.is_completed() {
unsafe {
- INSTANCE.assume_init_drop();
+ INSTANCE.assume_init_mut().terminate();
}
}
}