From 2b9ecf745ccc45a2daf8d0ac7719a8786a360313 Mon Sep 17 00:00:00 2001 From: patthoyts Date: Tue, 15 May 2007 23:20:16 +0000 Subject: Test ttk widgets --- ChangeLog | 4 ++++ win/makefile.vc | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5363543..b541e8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-05-16 Pat Thoyts + + * win/makefile.vc: Test ttk widgets + 2007-05-15 Joe English * unix/tkUnixRFont.c: Fix crash introduced by previous fix diff --git a/win/makefile.vc b/win/makefile.vc index 1b04264..54d9fe2 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.102 2007/05/14 20:58:31 dgp Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.103 2007/05/15 23:20:17 patthoyts Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -540,7 +540,9 @@ install: install-binaries install-libraries install-docs tktest: setup $(TKTEST) $(CAT32) -test: setup $(TKTEST) $(TKLIB) $(CAT32) +test: test-classic test-ttk + +test-classic: setup $(TKTEST) $(TKLIB) $(CAT32) set TCL_LIBRARY=$(TCL_LIBRARY) set TK_LIBRARY=$(TK_LIBRARY) !if $(TCLINSTALL) @@ -554,6 +556,20 @@ test: setup $(TKTEST) $(TKLIB) $(CAT32) $(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32) !endif +test-ttk: setup $(TKTEST) $(TKLIB) $(CAT32) + set TCL_LIBRARY=$(TCL_LIBRARY) + set TK_LIBRARY=$(TK_LIBRARY) +!if $(TCLINSTALL) + set PATH=$(_TCLDIR)\bin;$(PATH) +!else + set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH) +!endif +!if "$(OS)" == "Windows_NT" || "$(MSVCDIR)" == "IDE" + $(TKTEST) "$(ROOT)/tests/ttk/all.tcl" $(TESTFLAGS) | $(CAT32) +!else + $(TKTEST) "$(ROOT)/tests/ttk/all.tcl" $(TESTFLAGS) | $(CAT32) +!endif + runtest: setup $(TKTEST) $(TKLIB) $(CAT32) set TCL_LIBRARY=$(TCL_LIBRARY) set TK_LIBRARY=$(TK_LIBRARY) -- cgit v0.12