Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support cabal-doctest #427

Merged
merged 23 commits into from
Mar 20, 2021
Merged

support cabal-doctest #427

merged 23 commits into from
Mar 20, 2021

Commits on Feb 7, 2020

  1. Add test.

    @cdepillabout
    cdepillabout committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    5f9bdc5 View commit details
    Browse the repository at this point in the history

  2. wip

    @cdepillabout
    cdepillabout committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    f7dc472 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. Merge branch 'master' into support-cabal-doctest

    @angerman
    angerman committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    a1f6eaf View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. Merge branch 'master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    c7ba0f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. Merge master into support-cabal-doctest

    @hamishmack
    hamishmack committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    1d8a687 View commit details
    Browse the repository at this point in the history

  2. Fix merge regression

    @hamishmack
    hamishmack committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    473c375 View commit details
    Browse the repository at this point in the history

  3. Combine drv, drv.source and drv.dist for doctest

    @hamishmack
    hamishmack committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    c659d88 View commit details
    Browse the repository at this point in the history

  4. Skip cabal-doctests test when cross compiling

    @hamishmack
    hamishmack committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    fa9597f View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Add the --no-magic flag to the .cabal file for the cabal-doctests test. 

    This appears to be necessary on OSX.

The --no-magic flag stops the doctest executable from expanding path
arguments, trying to locate the package db, etc.

This shouldn't be necessary with cabal-doctest, since all the
necessary options to pass to doctest are computed when running the Setup.hs
script.

See
input-output-hk#427 (comment).
    @cdepillabout
    cdepillabout committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    1d6dd9c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    c3e883c View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Merge branch 'master' into support-cabal-doctest

    @angerman
    angerman committed May 1, 2020
    Configuration menu
    Copy the full SHA
    9caf1cd View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2021

  1. Merge master into support-cabal-doctest 

    # Conflicts:
#	builder/comp-builder.nix
#	lib/check.nix
#	lib/default.nix
#	test/default.nix
    @hamishmack
    hamishmack committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    cb20a5a View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2021

  1. Fix cabal-doctest support

    @hamishmack
    hamishmack committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    1b2eae0 View commit details
    Browse the repository at this point in the history

  2. Skip cabal-doctest test plan cross compiling

    @hamishmack
    hamishmack committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    69ba0c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    da71b82 View commit details
    Browse the repository at this point in the history

  2. More fixes for cabal-doctest

    @hamishmack
    hamishmack committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    cc58520 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    506e63a View commit details
    Browse the repository at this point in the history

  4. Skip cabal-doctest tests when cross compiling

    @hamishmack
    hamishmack committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    37c662a View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    49aca8b View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    7bb7914 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. Merge remote-tracking branch 'origin/master' into support-cabal-doctest 

    # Conflicts:
#	builder/comp-builder.nix
    @hamishmack
    hamishmack committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    49a78b8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    54486bb View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    8d3cd2e View commit details
    Browse the repository at this point in the history