diff --git a/M2/Macaulay2/m2/startup.m2.in b/M2/Macaulay2/m2/startup.m2.in index a9dc8e24fb..e0a86e362b 100644 --- a/M2/Macaulay2/m2/startup.m2.in +++ b/M2/Macaulay2/m2/startup.m2.in @@ -55,11 +55,11 @@ if firstTime then ( srcdirs = {}; markLoaded = (filepath, filetime, notify) -> ( - filepath = realpath toAbsolutePath filepath; filesLoaded#filepath = filetime; loadedFiles##loadedFiles = filepath; if notify then printerr("loaded ", filepath)); tryLoad = (filename, filepath, loadfun, notify) -> if fileExists filepath then ( + filepath = realpath toAbsolutePath filepath; filetime := fileTime filepath; if notify then printerr("loading ", filename); ret := loadfun filepath; diff --git a/M2/Macaulay2/tests/normal/testing.m2 b/M2/Macaulay2/tests/normal/testing.m2 index ef4902fae4..4337351980 100644 --- a/M2/Macaulay2/tests/normal/testing.m2 +++ b/M2/Macaulay2/tests/normal/testing.m2 @@ -1,8 +1,9 @@ -testpkg = minimizeFilename(temporaryFileName() | ".m2") +testpkg = temporaryFileName() | ".m2" testpkg << ///newPackage("TestPackage") beginDocumentation() TEST "assert Equation(1 + 1, 2)" /// << close +testpkg = minimizeFilename realpath testpkg loadPackage("TestPackage", FileName => testpkg) check "TestPackage" pkgtest = tests(0, "TestPackage")