diff --git a/M2/Macaulay2/m2/packages.m2 b/M2/Macaulay2/m2/packages.m2 index c81b7cc1a0..b45486fe92 100644 --- a/M2/Macaulay2/m2/packages.m2 +++ b/M2/Macaulay2/m2/packages.m2 @@ -338,7 +338,6 @@ newPackage String := opts -> pkgname -> ( "previous currentPackage" => currentPackage, "previous dictionaries" => dictionaryPath, "previous packages" => loadedPackages, - "test number" => 0, "test inputs" => new MutableList, "raw documentation" => new MutableHashTable, -- deposited here by 'document' "processed documentation" => new MutableHashTable, -- the output from 'documentation', look here first diff --git a/M2/Macaulay2/m2/testing.m2 b/M2/Macaulay2/m2/testing.m2 index fcd9395e99..9fbe5171df 100644 --- a/M2/Macaulay2/m2/testing.m2 +++ b/M2/Macaulay2/m2/testing.m2 @@ -22,7 +22,7 @@ editMethod TestInput := editMethod @@ locate TEST = method(Options => {FileName => false}) TEST List := opts -> testlist -> apply(testlist, test -> TEST(test, opts)) TEST String := opts -> teststring -> ( - n := currentPackage#"test number"; + n := #currentPackage#"test inputs"; if opts.FileName then ( filename := teststring; teststring = get filename; @@ -36,8 +36,7 @@ TEST String := opts -> teststring -> ( "location" => new FilePosition from { minimizeFilename filename, start, 1, stop, 80}, -- TODO: get actual final column - "code" => teststring}; - currentPackage#"test number" += 1;) + "code" => teststring};) -- TODO: support test titles ----------------------------------------------------------------------------- diff --git a/M2/Macaulay2/packages/CMakeLists.txt b/M2/Macaulay2/packages/CMakeLists.txt index 54849d658c..1cb2d98847 100644 --- a/M2/Macaulay2/packages/CMakeLists.txt +++ b/M2/Macaulay2/packages/CMakeLists.txt @@ -70,7 +70,7 @@ set(M2_INSTALL_TEMPLATE [[installPackage("@package@", DebuggingMode => true)]]) set(M2_NEED_TEMPLATE [[needsPackage("@package@", LoadDocumentation=>true, DebuggingMode=>true)]]) set(M2_TEST_TEMPLATE [[debug Core \; argumentMode = @ArgumentMode@ \; check(@_i@, "@package@")]]) -set(M2_INFO_TEMPLATE [["info-"|"@package@" << @package@#"test number" << close]]) # ignore the color +set(M2_INFO_TEMPLATE [["info-"|"@package@" << #@package@#"test inputs" << close]]) # ignore the color set(M2_CHECK_TEMPLATE [[check("@package@", UserMode=>false, Verbose=>$,true,false>)]]) # TODO: simplify