kernel[2/2]: fix path test to pass on 95 and 98

Alexandre Julliard julliard at winehq.org
Tue May 16 13:20:57 CDT 2006


Andrew Ziem <ahziem1 at mailbolt.com> writes:

> --- dlls/kernel/tests/path1.c	2006-05-14 23:32:47.000000000 -0600
> +++ dlls/kernel/tests/path.c	2006-05-15 08:08:52.000000000 -0600
> @@ -339,14 +339,22 @@
>       newdir,tmpstr,tmpstr1,id);
>    ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n");     
>  
> -  ok((id=GetTempFileNameA(tmppath,NULL,0,newdir)),"GetTempFileNameA failed\n");
> -  sprintf(tmpstr,"%.4x.tmp",id & 0xffff);
> -  sprintf(tmpstr1,"%x.tmp",id & 0xffff);
> -  ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 ||
> -     lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0,
> -     "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n",
> -     newdir,tmpstr,tmpstr1,id);
> -  ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n");
> +  if (GetVersion() & 0x80000000) {

You should never add version checks in tests, simply check for both
behaviors.

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list