wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Marcus Meissner : winetest: Close filehandle on run error (Coverity).
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: a89f877fd3f65275af407a3bf7d7896afdff930c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89f877fd3f65275af407a3bf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:12:11 2012 +0200 winetest: Close filehandle on run error (Coverity). --- programs/winetest/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 45c8602..cc73f94 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -662,6 +662,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) if (status == -2) { report (R_ERROR, "Cannot run %s error %u", test->exename, err); + CloseHandle( subfile ); goto quit; }

1 0

Marcus Meissner : advapi32: Removed a double free issue on loop termination (Coverity).
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 748dd6fed378adb4ebe00ce0ca14d036d72380b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748dd6fed378adb4ebe00ce0c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:00:17 2012 +0200 advapi32: Removed a double free issue on loop termination (Coverity). --- dlls/advapi32/tests/crypt.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 7abf90b..4820d27 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -624,9 +624,6 @@ static BOOL FindProvTypesRegVals(DWORD *pdwIndex, DWORD *pdwProvType, LPSTR *psz (*pdwIndex)++; } - - if (!ret) - LocalFree(*pszTypeName); RegCloseKey(hSubKey); LocalFree(szName);

1 0

Marcus Meissner : server: Removed duplicate close of acceptfd (Coverity).
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 3199fe147de2bf48aca48eba3a75be1b500b2030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3199fe147de2bf48aca48eba3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:06:55 2012 +0200 server: Removed duplicate close of acceptfd (Coverity). --- server/sock.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 7e4acd8..7dcc101 100644 --- a/server/sock.c +++ b/server/sock.c @@ -760,10 +760,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) if (!(newfd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj, get_fd_options( acceptsock->fd ) ))) - { - close( acceptfd ); return FALSE; - } } acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE;

1 0

Henri Verbeet : wined3d: Implement SM4 WINED3DSIH_SINCOS in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 8f915156b96ec3e9d2607c76c2cf0984f357fbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f915156b96ec3e9d2607c76c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:51 2012 +0200 wined3d: Implement SM4 WINED3DSIH_SINCOS in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4196fa5..0c5ceb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2909,28 +2909,68 @@ static void shader_glsl_dst(const struct wined3d_shader_instruction *ins) */ static void shader_glsl_sincos(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; DWORD write_mask; - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + if (ins->ctx->reg_maps->shader_version.major < 4) + { + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - switch (write_mask) { - case WINED3DSP_WRITEMASK_0: - shader_addline(ins->ctx->buffer, "cos(%s));\n", src0_param.param_str); - break; + write_mask = shader_glsl_append_dst(buffer, ins); + switch (write_mask) + { + case WINED3DSP_WRITEMASK_0: + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); + break; - case WINED3DSP_WRITEMASK_1: - shader_addline(ins->ctx->buffer, "sin(%s));\n", src0_param.param_str); - break; + case WINED3DSP_WRITEMASK_1: + shader_addline(buffer, "sin(%s));\n", src0_param.param_str); + break; - case (WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1): - shader_addline(ins->ctx->buffer, "vec2(cos(%s), sin(%s)));\n", src0_param.param_str, src0_param.param_str); - break; + case (WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1): + shader_addline(buffer, "vec2(cos(%s), sin(%s)));\n", + src0_param.param_str, src0_param.param_str); + break; - default: - ERR("Write mask should be .x, .y or .xy\n"); - break; + default: + ERR("Write mask should be .x, .y or .xy\n"); + break; + } + + return; + } + + if (ins->dst[0].reg.type != WINED3DSPR_NULL) + { + + if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + char dst_mask[6]; + + write_mask = shader_glsl_get_write_mask(&ins->dst[0], dst_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "tmp0%s = sin(%s);\n", dst_mask, src0_param.param_str); + + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); + + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_addline(buffer, "tmp0%s);\n", dst_mask); + } + else + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "sin(%s));\n", src0_param.param_str); + } + } + else if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); } }

1 0

Henri Verbeet : wined3d: Implement SM4 loops in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: e34acc225122072acb2238bc0a8e0d2a46f59b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e34acc225122072acb2238bc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:50 2012 +0200 wined3d: Implement SM4 loops in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 106 +++++++++++++++++++++++++------------------- 1 files changed, 60 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed5db06..4196fa5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1181,9 +1181,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare loop registers aLx */ - for (i = 0; i < reg_maps->loop_depth; i++) { - shader_addline(buffer, "int aL%u;\n", i); - shader_addline(buffer, "int tmpInt%u;\n", i); + if (reg_maps->shader_version.major < 4) + { + for (i = 0; i < reg_maps->loop_depth; ++i) + { + shader_addline(buffer, "int aL%u;\n", i); + shader_addline(buffer, "int tmpInt%u;\n", i); + } } /* Temporary variables for matrix operations */ @@ -2954,68 +2958,78 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; struct glsl_src_param src1_param; const DWORD *control_values = NULL; - shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); - - /* Try to hardcode the loop control parameters if possible. Direct3D 9 class hardware doesn't support real - * varying indexing, but Microsoft designed this feature for Shader model 2.x+. If the loop control is - * known at compile time, the GLSL compiler can unroll the loop, and replace indirect addressing with direct - * addressing. - */ - if (ins->src[1].reg.type == WINED3DSPR_CONSTINT) + if (ins->ctx->reg_maps->shader_version.major < 4) { - LIST_FOR_EACH_ENTRY(constant, &shader->constantsI, struct wined3d_shader_lconst, entry) + shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); + + /* Try to hardcode the loop control parameters if possible. Direct3D 9 + * class hardware doesn't support real varying indexing, but Microsoft + * designed this feature for Shader model 2.x+. If the loop control is + * known at compile time, the GLSL compiler can unroll the loop, and + * replace indirect addressing with direct addressing. */ + if (ins->src[1].reg.type == WINED3DSPR_CONSTINT) { - if (constant->idx == ins->src[1].reg.idx) + LIST_FOR_EACH_ENTRY(constant, &shader->constantsI, struct wined3d_shader_lconst, entry) { - control_values = constant->value; - break; + if (constant->idx == ins->src[1].reg.idx) + { + control_values = constant->value; + break; + } } } - } - - if (control_values) - { - struct wined3d_shader_loop_control loop_control; - loop_control.count = control_values[0]; - loop_control.start = control_values[1]; - loop_control.step = (int)control_values[2]; - if (loop_control.step > 0) - { - shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d) {\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); - } - else if (loop_control.step < 0) + if (control_values) { - shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d) {\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); + struct wined3d_shader_loop_control loop_control; + loop_control.count = control_values[0]; + loop_control.start = control_values[1]; + loop_control.step = (int)control_values[2]; + + if (loop_control.step > 0) + { + shader_addline(buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d)\n{\n", + loop_state->current_depth, loop_control.start, + loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, + loop_state->current_depth, loop_control.step); + } + else if (loop_control.step < 0) + { + shader_addline(buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d)\n{\n", + loop_state->current_depth, loop_control.start, + loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, + loop_state->current_depth, loop_control.step); + } + else + { + shader_addline(buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++)\n{\n", + loop_state->current_depth, loop_control.start, loop_state->current_depth, + loop_state->current_depth, loop_control.count, + loop_state->current_depth); + } } else { - shader_addline(ins->ctx->buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++) {\n", - loop_state->current_depth, loop_control.start, loop_state->current_depth, - loop_state->current_depth, loop_control.count, - loop_state->current_depth); + shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", + loop_state->current_depth, loop_state->current_reg, + src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, + loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); } - } else { - shader_addline(ins->ctx->buffer, - "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z) {\n", - loop_state->current_depth, loop_state->current_reg, - src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, - loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); + + ++loop_state->current_reg; + } + else + { + shader_addline(buffer, "for (;;)\n{\n"); } ++loop_state->current_depth; - ++loop_state->current_reg; } static void shader_glsl_end(const struct wined3d_shader_instruction *ins)

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_IADD in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 6e4ecdf854059108b789c4dde69c1df816a7589d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ecdf854059108b789c4dde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:49 2012 +0200 wined3d: Implement WINED3DSIH_IADD in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 708c6d8..ed5db06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2198,6 +2198,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_ADD: op = '+'; break; case WINED3DSIH_AND: op = '&'; break; case WINED3DSIH_DIV: op = '/'; break; + case WINED3DSIH_IADD: op = '+'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; default: @@ -5173,7 +5174,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_GE */ NULL, - /* WINED3DSIH_IADD */ NULL, + /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_DIV in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: f9c181bf7429f885db49301d40ebbe79a863422f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c181bf7429f885db49301d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:48 2012 +0200 wined3d: Implement WINED3DSIH_DIV in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 66c1e9d..708c6d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2197,6 +2197,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_ADD: op = '+'; break; case WINED3DSIH_AND: op = '&'; break; + case WINED3DSIH_DIV: op = '/'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; default: @@ -5154,7 +5155,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DEF */ shader_glsl_nop, /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, - /* WINED3DSIH_DIV */ NULL, + /* WINED3DSIH_DIV */ shader_glsl_binop, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, /* WINED3DSIH_DP4 */ shader_glsl_dot,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_BREAKP in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 2b46c4046ac1aab30075e9470e255c55c93847c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b46c4046ac1aab30075e9470… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:47 2012 +0200 wined3d: Implement WINED3DSIH_BREAKP in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e2d2bb9..66c1e9d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3120,6 +3120,14 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) src0_param.param_str, shader_glsl_get_rel_op(ins->flags), src1_param.param_str); } +static void shader_glsl_breakp(const struct wined3d_shader_instruction *ins) +{ + struct glsl_src_param src_param; + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_addline(ins->ctx->buffer, "if (bool(%s)) break;\n", src_param.param_str); +} + static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { shader_addline(ins->ctx->buffer, "}\n"); @@ -5131,7 +5139,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, - /* WINED3DSIH_BREAKP */ NULL, + /* WINED3DSIH_BREAKP */ shader_glsl_breakp, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, /* WINED3DSIH_CMP */ shader_glsl_cmp,

1 0

Francois Gouget : testbot/build: Time the Reconfig.pl operations.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: tools Branch: master Commit: cbb2ff89b7b0a17dfd53a47a8334b222d4c343cf URL: http://source.winehq.org/git/tools.git/?a=commit;h=cbb2ff89b7b0a17dfd53a47a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:15:24 2012 +0200 testbot/build: Time the Reconfig.pl operations. --- testbot/bin/Reconfig.pl | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index 3b60abd..f049e8a 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -80,9 +80,9 @@ sub BuildNative mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " ../wine-git/configure --enable-win64 --without-x --without-freetype && " . - " make -j$ncpus depend && " . - " make -j$ncpus __tooldeps__ " . + " time ../wine-git/configure --enable-win64 --without-x --without-freetype && " . + " time make -j$ncpus depend && " . + " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) @@ -102,9 +102,9 @@ sub BuildCross mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . - " make -j$ncpus depend && " . - " make -j$ncpus programs/winetest " . + " time ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . + " time make -j$ncpus depend && " . + " time make -j$ncpus programs/winetest " . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot/build: Trace the build commands to help developers analyze the logs.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: tools Branch: master Commit: 122787dad633ab6023eeab15113906177b7b011d URL: http://source.winehq.org/git/tools.git/?a=commit;h=122787dad633ab6023eeab15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:15:04 2012 +0200 testbot/build: Trace the build commands to help developers analyze the logs. --- testbot/bin/BuildSingleTest.pl | 48 +++++++++++++++++++++++++--------------- testbot/bin/Reconfig.pl | 24 ++++++++++---------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index af28f88..07787d4 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -119,8 +119,9 @@ sub ApplyPatch if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; - system("cd $DataDir/wine-git; autoconf --output configure configure.ac" . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/wine-git && set -x && " . + " autoconf --output configure configure.ac " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Autoconf failed\n"; @@ -169,10 +170,9 @@ sub BuildTestExecutable { InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); - system("cd $DataDir/build-mingw$Bits && " . - "../wine-git/configure --host=$Host " . - "--with-wine-tools=../build-native --without-x --without-freetype " . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Reconfigure of $Bits-bit crossbuild failed\n"; @@ -183,15 +183,18 @@ sub BuildTestExecutable if ($NeedMakeInclude || $NeedConfigure) { InfoMsg "Recreating include/Makefile\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Recreation of include/Makefile failed\n"; return !1; } - system("make -j$ncpus -C $DataDir/build-mingw${Bits}/include " . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus include " . + ") >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Make in include dir failed\n"; @@ -202,15 +205,18 @@ sub BuildTestExecutable if ($NeedImplib || $NeedConfigure) { InfoMsg "Rebuilding $BaseName import lib\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Unable to regenerate $PatchType/$BaseName/Makefile\n"; } else { - system("make -j$ncpus -C $DataDir/build-mingw${Bits}/$PatchType/$BaseName " . - "lib$BaseName.a >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { InfoMsg "Make of import library failed\n"; @@ -221,7 +227,9 @@ sub BuildTestExecutable if ($NeedMakefile || $NeedConfigure) { InfoMsg "Recreating tests/Makefile\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Recreation of tests/Makefile failed\n"; @@ -232,7 +240,9 @@ sub BuildTestExecutable if ($NeedBuildDeps) { InfoMsg "Making build dependencies\n"; - system("cd $DataDir/build-mingw${Bits}; make -j$ncpus __builddeps__ >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus __builddeps__ " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Making build dependencies failed\n"; @@ -240,23 +250,25 @@ sub BuildTestExecutable } } - my $TestsDir = "$DataDir/build-mingw${Bits}/$PatchType/$BaseName/tests"; + my $TestsDir = "$PatchType/$BaseName/tests"; my $TestExecutable = "$TestsDir/$BaseName"; if ($PatchType eq "programs") { $TestExecutable .= ".exe"; } $TestExecutable .= "_test.exe"; - unlink($TestExecutable); + unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); InfoMsg "Making test executable\n"; - system("make -j$ncpus -C $TestsDir >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus -C $TestsDir " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Make failed\n"; return !1; } - if (! -f $TestExecutable) + if (! -f "$DataDir/build-mingw${Bits}/$TestExecutable") { LogMsg "Make didn't produce a $TestExecutable file\n"; return !1; diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index fe789f0..3b60abd 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -78,12 +78,12 @@ sub CountCPUs() sub BuildNative { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); - system("cd $DataDir/build-native && " . - "rm -rf * && " . - "../wine-git/configure --enable-win64 --without-x --without-freetype " . - ">> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus __tooldeps__ >> $LogDir/Reconfig.log 2>&1"); + system("( cd $DataDir/build-native && set -x && " . + " rm -rf * && " . + " ../wine-git/configure --enable-win64 --without-x --without-freetype && " . + " make -j$ncpus depend && " . + " make -j$ncpus __tooldeps__ " . + ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -100,12 +100,12 @@ sub BuildCross my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); - system("cd $DataDir/build-mingw$Bits && " . - "rm -rf * && " . - "../wine-git/configure --host=$Host --with-wine-tools=../build-native " . - "--without-x --without-freetype >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus programs/winetest >> $LogDir/Reconfig.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " rm -rf * && " . + " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . + " make -j$ncpus depend && " . + " make -j$ncpus programs/winetest " . + ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { LogMsg "Build cross ($Bits bits) failed\n";

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012