ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winetest: Don't submit test results if we don't have a valid git build id.

This commit is contained in:
Alexandre Julliard 2008-05-27 11:48:50 +02:00
parent 808f5c8ded
commit 9f74bf1eb2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/winetest/main.c
View File

@ -54,6 +54,7 @@ static struct wine_test *wine_tests;
static int nr_of_files, nr_of_tests; static int nr_of_files, nr_of_tests;
static const char whitespace[] = " \t\r\n"; static const char whitespace[] = " \t\r\n";
static const char testexe[] = "_test.exe"; static const char testexe[] = "_test.exe";
static char build_id[64];
static char * get_file_version(char * file_name) static char * get_file_version(char * file_name)
{ {
@ -462,7 +463,6 @@ run_tests (char *logname)
int logfile; int logfile;
char *strres, *eol, *nextline; char *strres, *eol, *nextline;
DWORD strsize; DWORD strsize;
char build[64];
SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
@ -499,9 +499,7 @@ run_tests (char *logname)
report (R_DIR, tempdir); report (R_DIR, tempdir);
xprintf ("Version 4\n"); xprintf ("Version 4\n");
xprintf ("Tests from build "); xprintf ("Tests from build %s\n", build_id[0] ? build_id : "-" );
if (LoadStringA( 0, IDS_BUILD_ID, build, sizeof(build) )) xprintf( "%s\n", build );
else xprintf ("-\n");
strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize); strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize);
xprintf ("Archive: "); xprintf ("Archive: ");
if (strres) xprintf ("%.*s", strsize, strres); if (strres) xprintf ("%.*s", strsize, strres);
@ -593,6 +591,8 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst,
int poweroff = 0; int poweroff = 0;
int interactive = 1; int interactive = 1;
if (!LoadStringA( 0, IDS_BUILD_ID, build_id, sizeof(build_id) )) build_id[0] = 0;
cmdLine = strtok (cmdLine, whitespace); cmdLine = strtok (cmdLine, whitespace);
while (cmdLine) { while (cmdLine) {
if (cmdLine[0] != '-' || cmdLine[2]) { if (cmdLine[0] != '-' || cmdLine[2]) {
@ -676,10 +676,14 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst,
} }
report (R_TAG); report (R_TAG);
if (!build_id[0])
report( R_WARNING, "You won't be able to submit results without a valid build id.\n"
"To submit results, winetest needs to be built from a git checkout." );
if (!logname) { if (!logname) {
logname = run_tests (NULL); logname = run_tests (NULL);
if (report (R_ASK, MB_YESNO, "Do you want to submit the " if (build_id[0] &&
"test results?") == IDYES) report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES)
if (!send_file (logname) && remove (logname)) if (!send_file (logname) && remove (logname))
report (R_WARNING, "Can't remove logfile: %d.", errno); report (R_WARNING, "Can't remove logfile: %d.", errno);
free (logname); free (logname);