Skip to content

Commit c7b8c93

Browse files
committed
.travis.yml: looks like the dylib hack can be removed
Based on a test in a branch, it looks like we can now get rid of the gross workaround relating to $DYLD_LIBRARY_PATH. Yay!
1 parent 94ead2b commit c7b8c93

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

.travis.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,7 @@ before_script:
3434
export DEP_OPENSSL_INCLUDE=$(brew --prefix openssl)/include &&
3535
export PKG_CONFIG_PATH=/usr/local/opt/icu4c/lib/pkgconfig
3636
37-
# Temporary(?) hack: `cargo test` on OSX fails since it runs the test programs
38-
# with DYLD_LIBRARY_PATH set (see cargo:
39-
# src/cargo/ops/cargo_rustc/compilation.rs:fill_env()), which in our case
40-
# interacts poorly with the fact that one of the system frameworks uses an
41-
# internal version of libpng that clashes with the one provided by Homebrew
42-
# (see, e.g.,
43-
# http://stackoverflow.com/questions/17643509/conflict-between-dynamic-linking-priority-in-osx).
44-
# This is Cargo issue #3366 on GitHub.
45-
#
46-
# The test programs work if we just run them manually. So, do that. This is
47-
# not awesome since it won't scale well at all as we add more test runner
48-
# programs.
49-
5037
script:
5138
- |
5239
cargo build --verbose &&
53-
cargo test --no-run &&
54-
target/debug/tex_outputs-???????????????? &&
55-
target/debug/trip-????????????????
40+
cargo test

0 commit comments

Comments
 (0)