From 74a27c102e8edcdc084e45dbd4a8d7e87a104083 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 28 Jul 2021 12:11:35 -0400 Subject: [PATCH 1/2] correct prerequisite --- unittest/force-styles/tests/atomic-pair-lj_relres.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unittest/force-styles/tests/atomic-pair-lj_relres.yaml b/unittest/force-styles/tests/atomic-pair-lj_relres.yaml index 99a83e0c8d..704bb46785 100644 --- a/unittest/force-styles/tests/atomic-pair-lj_relres.yaml +++ b/unittest/force-styles/tests/atomic-pair-lj_relres.yaml @@ -3,7 +3,7 @@ lammps_version: 10 Feb 2021 date_generated: Sun Feb 28 23:32:03 2021 epsilon: 5e-13 prerequisites: ! | - pair born + pair lj/relres pre_commands: ! "" post_commands: ! "" input_file: in.metal From 600471d07f2af2664dbbb996e3a28ca3bb659b0c Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 28 Jul 2021 12:11:54 -0400 Subject: [PATCH 2/2] skip run test with fix when fix is not available --- unittest/formats/test_dump_custom.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unittest/formats/test_dump_custom.cpp b/unittest/formats/test_dump_custom.cpp index 772acaacb6..90876dcb2d 100644 --- a/unittest/formats/test_dump_custom.cpp +++ b/unittest/formats/test_dump_custom.cpp @@ -143,6 +143,8 @@ TEST_F(DumpCustomTest, compute_run0) TEST_F(DumpCustomTest, fix_run0) { + if (!info->has_style("fix", "numdiff")) GTEST_SKIP(); + BEGIN_HIDE_OUTPUT(); command("fix numdiff all numdiff 1 0.0001"); END_HIDE_OUTPUT();