Skip to content

Commit ed37512

Browse files
committed
ci: run wkhtmltopdf only on linux again
1 parent 9cc9ce6 commit ed37512

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

cmd/tools/modules/testing/common.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ pub fn new_test_session(_vargs string) TestSession {
143143
skip_files << 'examples/sokol/06_obj_viewer/obj/util.v'
144144
}
145145
if testing.github_job != 'ubuntu-tcc' {
146-
skip_files << 'examples/wkhtmltopdf.v' // needs installation of wkhtmltopdf from https://github.com/wkhtmltopdf/packaging/releases
146+
skip_files << 'examples/c_interop_wkhtmltopdf.v' // needs installation of wkhtmltopdf from https://github.com/wkhtmltopdf/packaging/releases
147147
// the ttf_test.v is not interactive, but needs X11 headers to be installed, which is done only on ubuntu-tcc for now
148148
skip_files << 'vlib/x/ttf/ttf_test.v'
149149
}

examples/c_interop_wkhtmltopdf.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn main() {
7171
error_code := C.wkhtmltopdf_http_error_code(converter)
7272
println('wkhtmltopdf_http_error_code: $error_code')
7373
if result {
74-
data := &&char(0)
74+
data := &charptr(0)
7575
size := C.wkhtmltopdf_get_output(converter, data)
7676
println('wkhtmltopdf_get_output: $size bytes')
7777
mut file := os.open_file('./google.pdf', 'w+', 0o666) or {

vlib/v/ast/ast.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ pub mut:
10671067
typname string // TypeSymbol.name
10681068
expr_type Type // `byteptr`
10691069
has_arg bool
1070-
in_prexpr bool // is the parent node an PrefixExpr
1070+
in_prexpr bool // is the parent node a PrefixExpr
10711071
}
10721072

10731073
pub struct AsmStmt {

vlib/v/parser/pratt.v

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,10 @@ fn (mut p Parser) infix_expr(left ast.Expr) ast.Expr {
489489
}
490490
}
491491

492+
fn (p &Parser) fileis(s string) bool {
493+
return p.file_name.contains(s)
494+
}
495+
492496
fn (mut p Parser) prefix_expr() ast.PrefixExpr {
493497
mut pos := p.tok.position()
494498
op := p.tok.kind

0 commit comments

Comments
 (0)