From c06af67a15fe0eef8a17ff3d89d0f88193d5a6d6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 23 Nov 2023 13:48:05 +0000
Subject: Remove testgetencpath/testsetencpath test commands: Testcase can use
 "encoding dirs" as well. (borrowed from bug-2a0966cdc9 branch, testcase only)

---
 generic/tclTest.c   | 72 -----------------------------------------------------
 tests/encoding.test | 13 ++++------
 tests/unixInit.test |  3 ---
 3 files changed, 5 insertions(+), 83 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index e9a0a40..02e1fac 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -321,8 +321,6 @@ static Tcl_ObjCmdProc	TestFilesystemObjCmd;
 static Tcl_ObjCmdProc	TestSimpleFilesystemObjCmd;
 static void		TestReport(const char *cmd, Tcl_Obj *arg1,
 			    Tcl_Obj *arg2);
-static Tcl_ObjCmdProc	TestgetencpathObjCmd;
-static Tcl_ObjCmdProc	TestsetencpathObjCmd;
 static Tcl_Obj *	TestReportGetNativePath(Tcl_Obj *pathPtr);
 static Tcl_FSStatProc TestReportStat;
 static Tcl_FSAccessProc TestReportAccess;
@@ -749,10 +747,6 @@ Tcltest_Init(
 	    NULL, NULL);
     Tcl_CreateObjCommand(interp, "testinterpresolver", TestInterpResolverCmd,
 	    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testgetencpath", TestgetencpathObjCmd,
-	    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testsetencpath", TestsetencpathObjCmd,
-	    NULL, NULL);
     Tcl_CreateObjCommand(interp, "testapplylambda", TestApplyLambdaObjCmd,
 	    NULL, NULL);
 
@@ -8417,72 +8411,6 @@ TestconcatobjCmd(
 /*
  *----------------------------------------------------------------------
  *
- * TestgetencpathObjCmd --
- *
- *	This function implements the "testgetencpath" command. It is used to
- *	test Tcl_GetEncodingSearchPath().
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgetencpathObjCmd(
-    TCL_UNUSED(void *),
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const *objv)		/* Argument strings. */
-{
-    if (objc != 1) {
-        Tcl_WrongNumArgs(interp, 1, objv, "");
-        return TCL_ERROR;
-    }
-
-    Tcl_SetObjResult(interp, Tcl_GetEncodingSearchPath());
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsetencpathCmd --
- *
- *	This function implements the "testsetencpath" command. It is used to
- *	test Tcl_SetDefaultEncodingDir().
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestsetencpathObjCmd(
-    TCL_UNUSED(void *),
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const *objv)	/* Argument strings. */
-{
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "defaultDir");
-        return TCL_ERROR;
-    }
-
-    Tcl_SetEncodingSearchPath(objv[1]);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TestparseargsCmd --
  *
  *	This procedure implements the "testparseargs" command. It is used to
diff --git a/tests/encoding.test b/tests/encoding.test
index 76b5306..70aa99e 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -41,7 +41,6 @@ testConstraint testencoding [llength [info commands testencoding]]
 testConstraint testbytestring [llength [info commands testbytestring]]
 testConstraint teststringbytes [llength [info commands teststringbytes]]
 testConstraint exec [llength [info commands exec]]
-testConstraint testgetencpath [llength [info commands testgetencpath]]
 
 # TclInitEncodingSubsystem is tested by the rest of this file
 # TclFinalizeEncodingSubsystem is not currently tested
@@ -1031,15 +1030,13 @@ foreach from {cp932 shiftjis euc-jp iso2022-jp} {
     }
 }
 
-test encoding-26.0 {Tcl_GetEncodingSearchPath} -constraints {
-    testgetencpath
-} -setup {
-    set origPath [testgetencpath]
-    testsetencpath slappy
+test encoding-26.0 {Tcl_GetEncodingSearchPath} -setup {
+    set origPath [encoding dirs]
+    encoding dirs slappy
 } -body {
-    testgetencpath
+    encoding dirs
 } -cleanup {
-    testsetencpath $origPath
+    encoding dirs $origPath
 } -result slappy
 
 file delete {*}[glob -directory [temporaryDirectory] *.chars *.tcltestout]
diff --git a/tests/unixInit.test b/tests/unixInit.test
index 3a9fa6d..3bbe1e9 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -17,9 +17,6 @@ if {"::tcltest" ni [namespace children]} {
 unset -nocomplain path
 catch {set oldlang $env(LANG)}
 set env(LANG) C
-
-# Some tests require the testgetencpath command
-testConstraint testgetencpath [llength [info commands testgetencpath]]
 
 test unixInit-1.1 {TclpInitPlatform: ignore SIGPIPE} {unix stdio} {
     set x {}
-- 
cgit v0.12