Opened 3 years ago

Closed 3 years ago

#10164 closed task (fixed)

Cleanup test framework string formatting

Reported by: thomie Owned by:
Priority: normal Milestone: 7.10.1
Component: Test Suite Version: 7.8.4
Keywords: Cc:
Operating System: Unknown/Multiple Architecture: Unknown/Multiple
Type of failure: None/Unknown Test Case:
Blocked By: Blocking:
Related Tickets: Differential Rev(s):
Wiki Page:

Description

This is a placeholder ticket for commits related to a cleanup of the testsuite and testsuite driver.

Change History (11)

comment:1 Changed 3 years ago by thomie

In 5258566ee5c89aa757b0cf1433169346319c018f/ghc:

commit 5258566ee5c89aa757b0cf1433169346319c018f
Author: Thomas Miedema <>
Date:   Fri Mar 6 21:55:36 2015 +0100

    Cleanup test framework string formatting
    
    * Use format strings instead of string concatenation.
    * Wrap `config.compiler`, `config.hpc` etc. in quotes in `mk/test.mk`, so we
      don't have to in .T scripts and driver/testlib.py.
    
    Update hpc submodule (test cleanup)
    
    Reviewers: austin
    
    Differential Revision: https://phabricator.haskell.org/D718

Merged to 7.10 in dde3a2378e3961f7eed82d07d2f1e904878cc2b0.

comment:2 Changed 3 years ago by thomie

In cc07a0ba64b554ffd1ff85757b02cd79d30ed57a/ghc:

commit cc07a0ba64b554ffd1ff85757b02cd79d30ed57a
Author: Thomas Miedema <thomasmiedema@gmail.com>
Date:   Fri Mar 13 21:07:15 2015 +0100

    Move the function strip_quotes to testutil.py
    
    If one runs the testsuite with a profiling compiler, during the import
    of `testlib.py`, `testlib.py` sets the global variable `gs_working`. To
    do so, it executes a few statements which require the function
    `strip_quotes` to be in scope. But that function only gets defined at
    the very end of testlib.py.
    
    This patch moves the definition of `strip_quotes` to testutil.py, which
    is imported at the very top of testlib.py. This unbreaks the nightly
    builders.
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D728

Merged to 7.10 in 65753a9d3414d52b9a97cb23e3c8cff84f7528e5.

comment:3 Changed 3 years ago by thomie

In beee618c4ab8f725acd4dce3ef8a0d4ce84bb6ec/ghc:

commit beee618c4ab8f725acd4dce3ef8a0d4ce84bb6ec
Author: Thomas Miedema <thomasmiedema@gmail.com>
Date:   Sun Mar 15 21:06:39 2015 +0100

    Fix testsuite driver for a profiling compiler
    
    This should have been part of commit 5258566ee5c8, to allow expansion of
    '{hp2ps}' in a command string to `config.hp2ps`.
    
    Reviewed by: austin
    
    Differential Revision: https://phabricator.haskell.org/D734

comment:4 Changed 3 years ago by thomie

In 9987c66d7c3a1186acb5a32e92cd6846d71987a5/ghc:

commit 9987c66d7c3a1186acb5a32e92cd6846d71987a5
Author: Thomas Miedema <thomasmiedema@gmail.com>
Date:   Tue Mar 17 12:08:59 2015 +0100

    Fix Windows testsuite driver
    
    This got broken in commit 5258566.

comment:5 Changed 3 years ago by thomie

Status: newmerge

Since the first 2 commits were merged to 7.10, I think the other 2 should as well.

comment:6 Changed 3 years ago by thomie

Milestone: 7.10.1

comment:7 Changed 3 years ago by thoughtpolice

Resolution: fixed
Status: mergeclosed

Done - all merged.

comment:8 Changed 3 years ago by Thomas Miedema <thomasmiedema@…>

In 0f03a843e7e740218f3ce3853f80de99b0ed6236/ghc:

Make testsuite driver Python 2.6 compatible again

Another bug in the #10164 series. Only Python 2.7 and up allow you to
omit the positional argument specifiers in format strings.

Test Plan: this fixes the Solaris builders

Reviewed By: kgardas

Differential Revision: https://phabricator.haskell.org/D750

GHC Trac Issues: #10164

comment:9 Changed 3 years ago by thomie

Resolution: fixed
Status: closednew

comment:10 Changed 3 years ago by thomie

Status: newmerge

austin: sorry to bother you with this last-minute patch.

It would not be the end of the world if it doesn't make it, as it would just require python 2.7 to be installed to run the 7.10 testsuite.

comment:11 Changed 3 years ago by thoughtpolice

Resolution: fixed
Status: mergeclosed

Merged.

Note: See TracTickets for help on using tickets.