Test ExtendRootDirectories and SetPackagePath

Move mockpkg to subdirectory pkg for this.
gap-system · Nov 3, 2022 · e64f523 · e64f523
1 parent 82d700a
commit e64f523
Show file tree

Hide file tree

Showing 26 changed files with 21 additions and 5 deletions.
diff --git a/dev/ci.sh b/dev/ci.sh
@@ -251,7 +251,7 @@ GAPInput
     ln -s $SRCDIR/pkg $GAPPREFIX/share/gap/pkg
 
     # test building and loading package kernel extension
-    cd "$SRCDIR/tst/mockpkg"
+    cd "$SRCDIR/tst/pkg/mockpkg"
     testmockpkg "$GAPPREFIX/bin/gap" "$GAPPREFIX/lib/gap"
 
     # run testsuite for the resulting GAP
@@ -314,7 +314,7 @@ GAPInput
     cat "$BUILDDIR/sysinfo.gap"
 
     # test building and loading a package kernel extension
-    cd "$SRCDIR/tst/mockpkg"
+    cd "$SRCDIR/tst/pkg/mockpkg"
     testmockpkg "$GAP --cover $COVDIR/testmockpkg.coverage" "$BUILDDIR"
     ;;
 

diff --git a/tst/mockpkg/Makefile.gappkg b/tst/mockpkg/Makefile.gappkg
diff --git a/tst/mockpkg/.gitignore → tst/pkg/mockpkg/.gitignore b/tst/mockpkg/.gitignore → tst/pkg/mockpkg/.gitignore
diff --git a/tst/pkg/mockpkg/Makefile.gappkg b/tst/pkg/mockpkg/Makefile.gappkg
@@ -0,0 +1 @@
+../../../etc/Makefile.gappkg
diff --git a/tst/mockpkg/Makefile.in → tst/pkg/mockpkg/Makefile.in b/tst/mockpkg/Makefile.in → tst/pkg/mockpkg/Makefile.in
diff --git a/tst/mockpkg/PackageInfo.g → tst/pkg/mockpkg/PackageInfo.g b/tst/mockpkg/PackageInfo.g → tst/pkg/mockpkg/PackageInfo.g
diff --git a/tst/mockpkg/README.md → tst/pkg/mockpkg/README.md b/tst/mockpkg/README.md → tst/pkg/mockpkg/README.md
diff --git a/tst/mockpkg/configure → tst/pkg/mockpkg/configure b/tst/mockpkg/configure → tst/pkg/mockpkg/configure
diff --git a/tst/mockpkg/doc/.gitignore → tst/pkg/mockpkg/doc/.gitignore b/tst/mockpkg/doc/.gitignore → tst/pkg/mockpkg/doc/.gitignore
diff --git a/tst/mockpkg/doc/about.tex → tst/pkg/mockpkg/doc/about.tex b/tst/mockpkg/doc/about.tex → tst/pkg/mockpkg/doc/about.tex
diff --git a/tst/mockpkg/doc/chap0.html → tst/pkg/mockpkg/doc/chap0.html b/tst/mockpkg/doc/chap0.html → tst/pkg/mockpkg/doc/chap0.html
diff --git a/tst/mockpkg/doc/make_doc → tst/pkg/mockpkg/doc/make_doc b/tst/mockpkg/doc/make_doc → tst/pkg/mockpkg/doc/make_doc
diff --git a/tst/mockpkg/doc/manual.idx → tst/pkg/mockpkg/doc/manual.idx b/tst/mockpkg/doc/manual.idx → tst/pkg/mockpkg/doc/manual.idx
diff --git a/tst/mockpkg/doc/manual.mst → tst/pkg/mockpkg/doc/manual.mst b/tst/mockpkg/doc/manual.mst → tst/pkg/mockpkg/doc/manual.mst
diff --git a/tst/mockpkg/doc/manual.pdf → tst/pkg/mockpkg/doc/manual.pdf b/tst/mockpkg/doc/manual.pdf → tst/pkg/mockpkg/doc/manual.pdf
diff --git a/tst/mockpkg/doc/manual.six → tst/pkg/mockpkg/doc/manual.six b/tst/mockpkg/doc/manual.six → tst/pkg/mockpkg/doc/manual.six
diff --git a/tst/mockpkg/doc/manual.tex → tst/pkg/mockpkg/doc/manual.tex b/tst/mockpkg/doc/manual.tex → tst/pkg/mockpkg/doc/manual.tex
diff --git a/tst/mockpkg/gap/mockpkg.gd → tst/pkg/mockpkg/gap/mockpkg.gd b/tst/mockpkg/gap/mockpkg.gd → tst/pkg/mockpkg/gap/mockpkg.gd
diff --git a/tst/mockpkg/gap/mockpkg.gi → tst/pkg/mockpkg/gap/mockpkg.gi b/tst/mockpkg/gap/mockpkg.gi → tst/pkg/mockpkg/gap/mockpkg.gi
diff --git a/tst/mockpkg/init.g → tst/pkg/mockpkg/init.g b/tst/mockpkg/init.g → tst/pkg/mockpkg/init.g
diff --git a/tst/mockpkg/read.g → tst/pkg/mockpkg/read.g b/tst/mockpkg/read.g → tst/pkg/mockpkg/read.g
diff --git a/tst/mockpkg/src/mockpkg.c → tst/pkg/mockpkg/src/mockpkg.c b/tst/mockpkg/src/mockpkg.c → tst/pkg/mockpkg/src/mockpkg.c
diff --git a/tst/mockpkg/tst/kext.tst → tst/pkg/mockpkg/tst/kext.tst b/tst/mockpkg/tst/kext.tst → tst/pkg/mockpkg/tst/kext.tst
diff --git a/tst/mockpkg/tst/testall.g → tst/pkg/mockpkg/tst/testall.g b/tst/mockpkg/tst/testall.g → tst/pkg/mockpkg/tst/testall.g
diff --git a/tst/testinstall/package.tst b/tst/testinstall/package.tst
@@ -1,4 +1,4 @@
-#@local entry,equ,pair,sml,oldTermEncoding,pkginfo,info,mockpkgpath,p,n
+#@local entry,equ,pair,sml,oldTermEncoding,pkginfo,info,mockpkgpath,tstpath,p,n
 gap> START_TEST("package.tst");
 
 # CompareVersionNumbers( <supplied>, <required>[, \"equal\"] )
@@ -640,5 +640,21 @@ false
 gap> IsPackageLoaded("mockpkg", ">=2.0");
 false
 
+# now add `tst` as a new root directory
+gap> tstpath := DirectoriesLibrary("tst")[1];;
+gap> ExtendRootDirectories( [ Filename( tstpath, "" ) ] );
+
+# make sure that the newly discovered installation path matches
+# the path from which mockpkg was loaded above
+gap> Last( GAPInfo.PackagesInfo.mockpkg ).InstallationPath =
+>      GAPInfo.PackagesLoaded.mockpkg[1];
+true
+
+#
+gap> SetPackagePath( "mockpkg", Filename( tstpath, "pkg/mockpkg" ) );
+gap> SetPackagePath( "mockpkg", Filename( tstpath, "pkg/mockpkg/" ) );
+gap> SetPackagePath( "mockpkg", "/some/other/directory" );
+Error, another version of package mockpkg is already loaded
+
 #
 gap> STOP_TEST( "package.tst", 1);
diff --git a/tst/teststandard/helptools.tst b/tst/teststandard/helptools.tst
@@ -58,7 +58,7 @@ gap> PrintRenderedText:=function( chapter, section, key... )
 
 # Load the help book for the mockpkg package
 #
-gap> HELP_ADD_BOOK("mockpkg","mockpkg",DirectoriesLibrary("tst/mockpkg/doc")[1]);
+gap> HELP_ADD_BOOK("mockpkg","mockpkg",DirectoriesLibrary("tst/pkg/mockpkg/doc")[1]);
 
 # First we test calling HELP_PRINT_SECTION_TEXT with three arguments
 #