pyrox.dev
or-tools: re-enable tests on x86_64-linux
This needs https://github.com/google/or-tools/pull/4745 to skip SCIP
tests if built without SCIP (which we currently do).
The tests currently still fail on aarch64-linux
(https://github.com/google/or-tools/issues/4746), so we only enable
for x86_64-linux. It can be re-tested with a more recent version once
or-tools is updated.
+15
-2
pkgs/by-name/or/or-tools/package.nix
+15
-2
pkgs/by-name/or/or-tools/package.nix
···
7
7
ensureNewerSourcesForZipFilesHook,
8
8
fetchFromGitHub,
9
9
fetchpatch,
10
+
gtest,
11
+
gbenchmark,
10
12
glpk,
11
13
highs,
12
14
lib,
···
55
57
url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch?rev=19";
56
58
hash = "sha256-r38ZbRkEW1ZvJb0Uf56c0+HcnfouZZJeEYlIK7quSjQ=";
57
59
})
60
+
(fetchpatch {
61
+
name = "math_opt-only-run-SCIP-tests-if-enabled.patch";
62
+
url = "https://github.com/google/or-tools/commit/b5a2f8ac40dd4bfa4359c35570733171454ec72b.patch";
63
+
hash = "sha256-h96zJkqTtwfBd+m7Lm9r/ks/n8uvY4iSPgxMZe8vtXI=";
64
+
})
58
65
];
59
66
60
67
# or-tools normally attempts to build Protobuf for the build platform when
···
108
115
cbc
109
116
eigen
110
117
glpk
118
+
gbenchmark
119
+
gtest
111
120
highs
112
121
python3.pkgs.absl-py
113
122
python3.pkgs.pybind11
···
131
140
];
132
141
nativeCheckInputs = [
133
142
python3.pkgs.matplotlib
143
+
python3.pkgs.pandas
144
+
python3.pkgs.pytest
145
+
python3.pkgs.scipy
146
+
python3.pkgs.svgwrite
134
147
python3.pkgs.virtualenv
135
148
];
136
149
137
-
# some tests fail on linux and hang on darwin
138
-
doCheck = false;
150
+
# some tests fail on aarch64-linux and hang on darwin
151
+
doCheck = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux;
139
152
140
153
preCheck = ''
141
154
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib