Update engine_tests macro to use semicolon syntax

Author: lyskov

tests/common/macros.rs

@@ -1,15 +1,19 @@
 #[allow(unused_macros)]
 macro_rules! engine_tests {
-    // ($test_fn:ident) => {
-    ($test_fn:ident $(, $feature:literal)*) => {
+    // Handles both cases:
+    //   common::engine_tests!(rfdiffusion);
+    //   common::engine_tests!(rfdiffusion; "high-memory-tests");
+    //   common::engine_tests!(rfdiffusion; "high-memory-tests", "some-awesome-feature");
+    //
+    ($test_fn:ident $(; $($feature:literal),+ $(,)?)?) => {
         ::paste::paste! {
 
             #[test]
             #[serial_test::serial]
             #[cfg_attr(
                 not(all(
-                    feature = "docker-tests",
-                    $(feature = $feature),*
+                    feature = "docker-tests"
+                    $( $(, feature = $feature)*)?
                 )),
                 ignore
             )]
@@ -22,27 +26,27 @@ macro_rules! engine_tests {
             #[serial_test::serial]
             #[cfg_attr(
                 not(all(
-                    feature = "hpc-tests",
-                    $(feature = $feature),*
+                    feature = "hpc-tests"
+                    $($(, feature = $feature)*)?
                 )),
                 ignore
             )]
             fn [<singularity_ $test_fn>]() {
                 $test_fn("singularity");
             }
+
             #[test]
             #[serial_test::serial]
             #[cfg_attr(
                 not(all(
-                    feature = "hpc-tests",
-                    $(feature = $feature),*
+                    feature = "hpc-tests"
+                    $($(, feature = $feature)*)?
                 )),
                 ignore
             )]
             fn [<apptainer_ $test_fn>]() {
                 $test_fn("apptainer");
             }
-
         }
     };
 }

tests/ligandmpnn.rs

@@ -8,7 +8,7 @@ common::engine_tests!(ligandmpnn);
 fn ligandmpnn(engine: &str) {
     use assert_fs::assert::PathAssert;
 
-    let root = std::path::PathBuf::from("target/proteinmpnn").join(engine);
+    let root = std::path::PathBuf::from("target/ligandmpnn").join(engine);
     std::fs::create_dir_all(&root).expect("create engine testing dir");
     let work_dir = TempDir::new_in(root).expect("create temp dir");
 

tests/pyrosetta.rs

@@ -10,7 +10,7 @@ fn pyrosetta(engine: &str) {
     use assert_fs::assert::PathAssert;
     use std::fs;
 
-    let root = std::path::PathBuf::from("target/score").join(engine);
+    let root = std::path::PathBuf::from("target/pyrosetta").join(engine);
     std::fs::create_dir_all(&root).expect("create engine testing dir");
     let work_dir = TempDir::new_in(root).expect("create temp dir");
 

tests/rfdiffusion.rs

@@ -3,7 +3,7 @@ use assert_fs::TempDir;
 
 mod common;
 
-common::engine_tests!(rfdiffusion, "high-memory-tests");
+common::engine_tests!(rfdiffusion; "high-memory-tests");
 
 fn rfdiffusion(engine: &str) {
     use assert_fs::assert::PathAssert;