ci: run wkhtmltopdf only on linux again

pull/9608/head
Alexander Medvednikov 2021-04-05 07:55:28 +03:00
parent 9cc9ce698f
commit ed37512ea9
4 changed files with 7 additions and 3 deletions

View File

@ -143,7 +143,7 @@ pub fn new_test_session(_vargs string) TestSession {
skip_files << 'examples/sokol/06_obj_viewer/obj/util.v' skip_files << 'examples/sokol/06_obj_viewer/obj/util.v'
} }
if testing.github_job != 'ubuntu-tcc' { if testing.github_job != 'ubuntu-tcc' {
skip_files << 'examples/wkhtmltopdf.v' // needs installation of wkhtmltopdf from https://github.com/wkhtmltopdf/packaging/releases skip_files << 'examples/c_interop_wkhtmltopdf.v' // needs installation of wkhtmltopdf from https://github.com/wkhtmltopdf/packaging/releases
// the ttf_test.v is not interactive, but needs X11 headers to be installed, which is done only on ubuntu-tcc for now // the ttf_test.v is not interactive, but needs X11 headers to be installed, which is done only on ubuntu-tcc for now
skip_files << 'vlib/x/ttf/ttf_test.v' skip_files << 'vlib/x/ttf/ttf_test.v'
} }

View File

@ -71,7 +71,7 @@ fn main() {
error_code := C.wkhtmltopdf_http_error_code(converter) error_code := C.wkhtmltopdf_http_error_code(converter)
println('wkhtmltopdf_http_error_code: $error_code') println('wkhtmltopdf_http_error_code: $error_code')
if result { if result {
data := &&char(0) data := &charptr(0)
size := C.wkhtmltopdf_get_output(converter, data) size := C.wkhtmltopdf_get_output(converter, data)
println('wkhtmltopdf_get_output: $size bytes') println('wkhtmltopdf_get_output: $size bytes')
mut file := os.open_file('./google.pdf', 'w+', 0o666) or { mut file := os.open_file('./google.pdf', 'w+', 0o666) or {

View File

@ -1067,7 +1067,7 @@ pub mut:
typname string // TypeSymbol.name typname string // TypeSymbol.name
expr_type Type // `byteptr` expr_type Type // `byteptr`
has_arg bool has_arg bool
in_prexpr bool // is the parent node an PrefixExpr in_prexpr bool // is the parent node a PrefixExpr
} }
pub struct AsmStmt { pub struct AsmStmt {

View File

@ -489,6 +489,10 @@ fn (mut p Parser) infix_expr(left ast.Expr) ast.Expr {
} }
} }
fn (p &Parser) fileis(s string) bool {
return p.file_name.contains(s)
}
fn (mut p Parser) prefix_expr() ast.PrefixExpr { fn (mut p Parser) prefix_expr() ast.PrefixExpr {
mut pos := p.tok.position() mut pos := p.tok.position()
op := p.tok.kind op := p.tok.kind