enable more scopflow tests and rebuild with latest hiop [deception-re…

…build] [incline-rebuild] [newell-rebuild]
pnnl · Nov 20, 2023 · 68f45a0 · 68f45a0
1 parent 2f43fda
commit 68f45a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,8 @@ install/*
 .ubuild.json
 *__pycache__*
 *nvblas.conf
-spack*
+spack-*
+spack.*
 .vscode/
 coinhsl-*
 node_modules

diff --git a/tests/functionality/scopflow/CMakeLists.txt b/tests/functionality/scopflow/CMakeLists.txt
@@ -84,13 +84,6 @@ if(EXAGO_INSTALL_TESTS)
     HOST
   )
 
-  if(EXAGO_ENABLE_IPOPT AND EXAGO_ENABLE_HIOP)
-    set_tests_properties(
-      FUNCTIONALITY_TEST_SCOPFLOW_HIOP_PBHIOP_TESTSUITE
-      PROPERTIES LABELS "newell-skip;deception-skip"
-    )
-  endif()
-
   exago_add_test(
     NAME
     FUNCTIONALITY_TEST_SCOPFLOW_HIOP_PBHIOP_MPI_TESTSUITE
@@ -141,13 +134,6 @@ if(EXAGO_INSTALL_TESTS)
     ${CMAKE_CURRENT_SOURCE_DIR}/hiop_serial.toml
   )
 
-  if(EXAGO_ENABLE_IPOPT AND EXAGO_ENABLE_HIOP)
-    set_tests_properties(
-      FUNCTIONALITY_TEST_SCOPFLOW_HIOP_SERIAL_TESTSUITE
-      PROPERTIES LABELS "incline-skip;deception-skip"
-    )
-  endif()
-
   exago_add_test(
     NAME
     FUNCTIONALITY_TEST_SCOPFLOW_HIOP_RAJA_TESTSUITE
@@ -161,13 +147,10 @@ if(EXAGO_INSTALL_TESTS)
     $<TARGET_FILE:test_scopflow_functionality>
     ${CMAKE_CURRENT_SOURCE_DIR}/hiop_raja.toml
   )
-
-  if(EXAGO_ENABLE_IPOPT AND EXAGO_ENABLE_HIOP)
-    set_tests_properties(
-      FUNCTIONALITY_TEST_SCOPFLOW_HIOP_RAJA_TESTSUITE
-      PROPERTIES LABELS "incline-skip;deception-skip"
-    )
-  endif()
+  set_tests_properties(
+    FUNCTIONALITY_TEST_SCOPFLOW_HIOP_RAJA_TESTSUITE PROPERTIES LABELS
+                                                               "incline-skip"
+  )
 
   foreach(fmt "MATPOWER" "CSV" "JSON" "MINIMAL")
     set(tname "SCOPFLOW_SOLUTION_OUTPUT_${fmt}")