- Cvs-hugs - Haskell.org

make check on Windows (MSYS), with patch
by Brian Smith 05 Sep '05

05 Sep '05

I have attached a patch that allows "make check" run more or less successfully on Windows. The patch converts Windows-style newlines to Unix-style newlines from the output of the test, so that when the actual output is compared to the expected output, the newline differences don't set off false positives. It also fixes a couple obvious problems with the tests to make them work on MSYS. I have also attached the results of "make check." I went through all the failures and gave some notes below. ./../src/hugs +q -w -pHugs: static/mod154.hs < nul This seems to be a known bug in Hugs since mod154.hs says "Hugs gets this wrong." ./../src/hugs +q -w -pHugs: rts/read.hs < rts/read.input The exponents on floating point numbers include an extra leading "0": "-3.10862446895044e-015" instead of "-3.10862446895044e-15" and "2.384186e-007" instead of "2.384186e-07". GHCi strips all the leading zeros from the exponents in both cases. So, there is a bug in the tests (doesn't properly take leading zeros into account in exponents) and/or Hugs (if the Haskell spec. requires leading zeros to be stripped like GHCi does). ./../src/hugs +q -w -pHugs: rts/arith.hs < rts/arith.input There is a difference "-0" vs. "0" that seems not totally unreasonable. The other difference "inf" vs. "1.#INF" seems like a bug in Hugs. ./../src/hugs +q -w -pHugs: ffi/Sin.hs < ffi/Sin.input The unexpected signal is troubling, but I don't know what the problem is. ./../src/hugs +q -w -pHugs: ffi/FileIO.hs < ffi/FileIO.input The unexpected error seems to be caused by the fact that "/tmp/test_write" is being opened, when this file doesn't exist normally on Windows. This is a bug in the test. ./../src/hugs +q -w -pHugs: ffi/Sparc.hs < ffi/Sparc.input I have no idea what is wrong. ./../src/ffihugs +q -w -pHugs: ffi/Callback.hs ffi/callback.c < nul This test assumes a case-sensitive file system that can distinguish between "Callback.c" and "callback.c." This test can be fixed by renaming "Callback.hs" to "CallbackTest.hs" and renaming callback.c to callback_c.c. Patch included, but you have to do the renaming of the file yourself. However, after getting it to build successfully, it still fails with output "unexpected signal" and exit code 1, and I have no idea why. ./../src/hugs +q -w -pHugs: System libs/system1.hs < libs/system1.input If I run this test directly it gives the expected output. But, inside of "make check" it fails because MSYS's SHELL is "sh.exe" instead of "sh." Patch included. ./../src/hugs +q -w -pHugs: Directory libs/dirTest.hs < libs/dirTest.input This test fails, but I think it is simply because NTFS doesn't support the same permission combinations as Unix/Linux. Either a Windows-specifc version should be written, or the test should be skipped on Windows.

2 6

cvs commit: hugs98/src hugs.c
by Ross Paterson 05 Sep '05

05 Sep '05

ross 2005/09/05 09:08:35 PDT Modified files: src hugs.c Log: comment Revision Changes Path 1.142 +3 -3 hugs98/src/hugs.c

1 0

cvs commit: hugs98/src hugs.c connect.h hugs98/src/winhugs DlgMain.c
by Ross Paterson 05 Sep '05

05 Sep '05

ross 2005/09/05 09:07:53 PDT Modified files: src hugs.c connect.h src/winhugs DlgMain.c Log: from Neil Mitchell: refactor the main loop to loop for standard Hugs and use normal Windows message pump (looping via longjmp) for WinHugs. This gives WinHugs much better performance and no polling. (I had to adjust this to make :q work for standard Hugs. I don't see how it works for WinHugs.) Revision Changes Path 1.141 +68 -50 hugs98/src/hugs.c 1.91 +5 -4 hugs98/src/connect.h 1.3 +1 -2 hugs98/src/winhugs/DlgMain.c

1 0

cvs commit: hugs98/src/winhugs DlgAbout.c
by Ross Paterson 05 Sep '05

05 Sep '05

ross 2005/09/05 08:47:44 PDT Modified files: src/winhugs DlgAbout.c Log: repair previous commit Revision Changes Path 1.3 +3 -1 hugs98/src/winhugs/DlgAbout.c

1 0

WinHugs, about dialog includes
by Neil Mitchell 05 Sep '05

05 Sep '05

Hi, It is insufficient to just include <connect.h>, you need storage and prelude as its dependancies. Thanks Neil

1 0

cvs commit: hugs98/src/winhugs winhugs.rc DlgAbout.c resrc1.h
by Ross Paterson 05 Sep '05

05 Sep '05

ross 2005/09/05 08:23:34 PDT Modified files: src/winhugs winhugs.rc DlgAbout.c resrc1.h Log: from Neil Mitchell: adds the version number to the About dialog box, and makes the hyperlinks to hugs-bugs and haskell.org/hugs clickable. Revision Changes Path 1.17 +4 -4 hugs98/src/winhugs/winhugs.rc 1.2 +36 -0 hugs98/src/winhugs/DlgAbout.c 1.3 +1 -0 hugs98/src/winhugs/resrc1.h

1 0

WinHugs, about dialog box
by Neil Mitchell 05 Sep '05

05 Sep '05

Hi, This patch modifies the about dialog box. It adds the version number for bug reports (this is the standard place for it in Windows), and makes the hyperlinks to hugs-bugs and haskell.org/hugs clickable. Thanks Neil

1 0

Hugs.c, main loop patch
by Neil Mitchell 05 Sep '05

05 Sep '05

Hi, This is the most invasive change in the hugs directory, and the last one. Split the main loop into invoke (which performs the computation) and prefix (which sets up the required bits). Change the main loop to call while(1){prefix(); invoke();} for the standard hugs. WinHugs now uses the normal windows message pump which gives it much better performance and no polling. It does this by calling invoke directly. If people would like to see revisions to this patch just ask, its a little more violent than I would like, but I'm not sure there is any better way. If you look at the code for the non-winhugs path, it comes out identical to what was being called before. With this patch, on Windows WinHugs now outperforms the standard console version by about 2 times in output intensive programs ([1..]), and is the same for compute intensive ones (nqueens). Thanks Neil

1 0

cvs commit: hugs98/src/winhugs DlgOptions.c resrc1.h winhugs.rc
by Ross Paterson 05 Sep '05

05 Sep '05

ross 2005/09/05 04:23:52 PDT Modified files: src/winhugs DlgOptions.c resrc1.h winhugs.rc Log: from Neil Mitchell: first page of the options dialog, including overlapping instances, here documents and H98 mode. Changing H98 mode is marked as "requires restart", but in fact: If you load a non-haskell 98 doc with +98, it fails. If you then go to options and set -98, then either :l or :r, it succeeds. If you then go to options and flip back to +98, :r succeeds (wrongly), but :l fails. Revision Changes Path 1.3 +28 -0 hugs98/src/winhugs/DlgOptions.c 1.2 +7 -1 hugs98/src/winhugs/resrc1.h 1.16 +13 -11 hugs98/src/winhugs/winhugs.rc

1 0

WinHugs, options dialog Haskell 98 mode
by Neil Mitchell 05 Sep '05

05 Sep '05

Hi, This patch implements the first page of the options dialog, including overlapping instances, here documents and haskell 98 mode. This does allow changing between haskell98 and not at runtime, but I have marked it with the warning "requires restart". This is not entirely true... If you load a non-haskell 98 doc with +98, it fails. If you then go to options and set -98, then either :l or :r, it succeeds. If you then go to options and flip back to +98, :r succeeds (wrongly), but :l fails. Thanks Neil

1 0