Fix workflow test errors

Author: KvGeijer

.github/workflows/rust.yml

@@ -18,13 +18,11 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install Boost
       run: sudo apt-get install -y libboost-all-dev
-    - name: Get submodules 
+    - name: Get submodules
       run: git submodule init && git submodule update
     - name: Build
-      run: cargo build --verbose --features all_queues
-    - name: Run queue tests
-      run: cargo test --verbose --features all_queues
+      run: cargo build --verbose --workspace --exclude bbq
+    - name: Run tests
+      run: cargo test --verbose --workspace --exclude bbq
     - name: Run nightly queues
-      run: cargo +nightly test --verbose -F nightly_queues
-    - name: Run benchmarking suite tests
-      run: cargo test --verbose --features tests_benchmark
+      run: cargo +nightly test --verbose -p bbq

benchmark_core/src/benchmarks.rs

@@ -243,7 +243,7 @@ pub fn print_info(queue: String, bench_conf: &BenchConfig) -> Result<(), std::io
 
 #[cfg(test)]
 mod tests {
-    use crate::arguments::EnqDeqArgs;
+    use crate::arguments::{EnqDeqArgs, EnqDeqPairsArgs};
     use crate::benchmarks::enq_deq_pairs::benchmark_enq_deq_pairs;
     use crate::benchmarks::{
         prod_con::benchmark_prod_con,
@@ -380,7 +380,7 @@ mod tests {
     #[test]
     fn run_enqdeq_pairs_with_struct() {
         let args = Args {
-            benchmark: Benchmarks::EnqDeq(EnqDeqArgs { thread_count: 10, spread: 0.5 }),
+            benchmark: Benchmarks::EnqDeqPairs(EnqDeqPairsArgs { thread_count: 10 }),
             ..Default::default()
         };
         let bench_conf = BenchConfig {
@@ -389,7 +389,7 @@ mod tests {
             benchmark_id: "test2".to_string(),
             output_filename: "".to_string()
         };
-        let queue = TestQueue::<Args>::new(0);
+        let queue = TestQueue::<usize>::new(0);
         if benchmark_enq_deq_pairs(queue, &bench_conf).is_err() {
             panic!();
         }

queues/tz_queue_hp/src/main.rs

@@ -10,7 +10,7 @@ fn main() {
     }
     log::info!("Starting benchmark");
 
-    match benchmark_core::benchmark_target_queue::<tsigas_zhang_queue_hp::TZQueue<usize>>("tsigas_zhang_queue_hp") {
+    match benchmark_core::benchmark_target_queue::<tz_queue_hp::TZQueue<usize>>("tz_queue_hp") {
         Ok(_) => println!("Benchmark done."),
         Err(e) => {
             eprintln!("Benchmark received error: {}", e);

queues/tz_queue_leak/src/main.rs

@@ -10,7 +10,7 @@ fn main() {
     }
     log::info!("Starting benchmark");
 
-    match benchmark_core::benchmark_target_queue::<tsigas_zhang_queue_leak::TZQueue<usize>>("tsigas_zhang_queue_leak") {
+    match benchmark_core::benchmark_target_queue::<tz_queue_leak::TZQueue<usize>>("tz_queue_leak") {
         Ok(_) => println!("Benchmark done."),
         Err(e) => {
             eprintln!("Benchmark received error: {}", e);