Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ctest2 instead of the original to fix warnings #68

Merged
merged 2 commits into from
Aug 27, 2020
Merged

Use ctest2 instead of the original to fix warnings #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a54cefe
Use `ctest2` instead of the original to fix warnings
JohnTitor Aug 21, 2020
2c34725
Fix a typo
JohnTitor Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ stock-zlib = []
# Deprecated: the assembly routines are outdated, and either reduce performance
# or cause segfaults.
asm = []
# Enable this feature if you want to have a staticly linked libz
# Enable this feature if you want to have a statically linked libz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind splitting this into a separate commit?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, added 2c34725.

static = []
2 changes: 1 addition & 1 deletion systest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ libz-sys = { path = "..", default-features = false, features = ["libc"] }
libc = "0.2"

[build-dependencies]
ctest = "0.1"
ctest2 = "0.3"

[features]
libz-static = ["libz-sys/static"]
Expand Down
6 changes: 3 additions & 3 deletions systest/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
extern crate ctest;
extern crate ctest2;

use std::env;

fn main() {
let mut cfg = ctest::TestGenerator::new();
let mut cfg = ctest2::TestGenerator::new();
cfg.header("zlib.h");
if let Some(s) = env::var_os("DEP_Z_INCLUDE") {
cfg.include(s);
}
cfg.type_name(|n, _| {
cfg.type_name(|n, _, _| {
if n == "internal_state" {
format!("struct {}", n)
} else {
Expand Down