1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
Author: Daniel Leidert <dleidert@debian.org>
Description: Don't run very expensive tests. This has been done
for a while via debian/patches/03_skip_expensive_tests.patch.
.
Fix test script to get the directories right.
Index: apbs/tests/apbs_tester.py
===================================================================
--- apbs.orig/tests/apbs_tester.py 2022-03-30 11:52:05.856817291 +0200
+++ apbs/tests/apbs_tester.py 2022-03-30 11:55:11.338237877 +0200
@@ -21,7 +21,7 @@
from apbs_logger import Logger
# The inputgen utility needs to be accessible, so we add its path
-sys.path.insert(0, "../tools/manip")
+sys.path.insert(0, "/usr/share/apbs/tools/manip")
from inputgen import split_input # noqa E402
SEARCH_PATH = os.environ.get("PATH").split(os.pathsep)
@@ -411,6 +411,8 @@
print("The following sections will be tested: " + ", ".join(test_sections))
print("=" * 80)
+ current_dir = os.getcwd()
+
# Run each test that has been requested
for test_name in test_sections:
@@ -422,7 +424,7 @@
return 1
# Grab the test directory
- test_directory = config.get(test_name, "input_dir")
+ test_directory = current_dir + "/" + config.get( test_name, 'input_dir' )
config.remove_option(test_name, "input_dir")
# Check if there is a setup step.
Index: apbs/tests/test_cases.cfg
===================================================================
--- apbs.orig/tests/test_cases.cfg 2022-03-30 11:52:05.856817291 +0200
+++ apbs/tests/test_cases.cfg 2022-03-30 11:55:56.634583316 +0200
@@ -42,12 +42,12 @@
input_dir : ../examples/ion-pmf
ion-pmf : 7.839535983197E+03 8.964727588811E+03 -1.125192402906E+03 *
-[ion-protein]
-input_dir : ../examples/ion-protein
-apbs-mol-pdiel2 : 7.525554553704E+03 2.967613272771E+03 1.050875942181E+04 1.559159533685E+01
-apbs-smol-pdiel2 : 7.561237446444E+03 2.974076897757E+03 1.055886976547E+04 2.355542126580E+01
-apbs-mol-pdiel12 : 1.363584355927E+03 5.110802147229E+02 1.892691797082E+03 1.802722643122E+01
-apbs-smol-pdiel12 : 1.366571366426E+03 5.108315415905E+02 1.896685358215E+03 1.928245019838E+01
+#[ion-protein]
+#input_dir : ../examples/ion-protein
+#apbs-mol-pdiel2 : 7.525554553704E+03 2.967613272771E+03 1.050875942181E+04 1.559159533685E+01
+#apbs-smol-pdiel2 : 7.561237446444E+03 2.974076897757E+03 1.055886976547E+04 2.355542126580E+01
+#apbs-mol-pdiel12 : 1.363584355927E+03 5.110802147229E+02 1.892691797082E+03 1.802722643122E+01
+#apbs-smol-pdiel12 : 1.366571366426E+03 5.108315415905E+02 1.896685358215E+03 1.928245019838E+01
[pka-lig]
input_dir : ../examples/pka-lig
@@ -76,36 +76,36 @@
apbs-smol : 1.847860440020E+03 1.885436377745E+03 2.734040568569E+03 3.125279428954E+03 -3.757593797629E+01 -3.912388198513E+02 -3.536628818750E+02
-[geoflow]
-input_dir : ../examples/geoflow
-imidazole : -1.030222099963E+01 5.417419E-01
-
-
-[bem]
-input_dir : ../examples/bem
-451c_order1 : -4.678324477794E+03
-451c_order5 : -4.678190000000e+03
-
-[bem-pKa]
-input_dir : ../examples/bem-pKa
-ASH66 : -4.005763343995E+00
-2LZT-ASH66 : -3.636994149197E+02
-2LZT-noASH66 : -3.625121468362E+02
-
-[bem-binding-energy]
-input_dir : ../examples/bem-binding-energy
-1d30 : -2.197264516397E+04
-1d30_monomer1 : -2.608072100934E+04
-1d30_monomer2 : -7.676311645066E+02
-
-
-[pbam]
-input_dir : ../examples/pbam
-toy_energyforce : -4.965018552290E+01 -4.965018552290E+01
-
-[pbsam]
-input_dir : ../examples/pbsam-gly
-gly_energyforce : 6.176608555569E-05 6.210593742215E-05
+#[geoflow]
+#input_dir : ../examples/geoflow
+#imidazole : -1.030222099963E+01 5.417419E-01
+#
+#
+#[bem]
+#input_dir : ../examples/bem
+#451c_order1 : -4.678324477794E+03
+#451c_order5 : -4.678190000000e+03
+#
+#[bem-pKa]
+#input_dir : ../examples/bem-pKa
+#ASH66 : -4.005763343995E+00
+#2LZT-ASH66 : -3.636994149197E+02
+#2LZT-noASH66 : -3.625121468362E+02
+#
+#[bem-binding-energy]
+#input_dir : ../examples/bem-binding-energy
+#1d30 : -2.197264516397E+04
+#1d30_monomer1 : -2.608072100934E+04
+#1d30_monomer2 : -7.676311645066E+02
+#
+#
+#[pbam]
+#input_dir : ../examples/pbam
+#toy_energyforce : -4.965018552290E+01 -4.965018552290E+01
+#
+#[pbsam]
+#input_dir : ../examples/pbsam-gly
+#gly_energyforce : 6.176608555569E-05 6.210593742215E-05
# Very slow test
#[protein-rna]
|
