From 1c4dbd7ed532d7e68b00c120d54e61e0e0515cce Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@mozilla.com>
Date: Tue, 4 Jun 2024 08:49:54 +0000
Subject: [PATCH] Bug 1899485 - Remove obsolete build/unix/run-mozilla.sh file
 r=glandium

It is no longer needed, commands should now be able to run without
environment manipulation.

Differential Revision: https://phabricator.services.mozilla.com/D212089
---
 build/unix/moz.build                          |   4 -
 build/unix/run-mozilla.sh                     | 350 ------------------
 config/config.mk                              |   4 -
 js/src/Makefile.in                            |   4 +-
 security/manager/tools/dumpGoogleRoots.js     |   2 +-
 security/manager/tools/genRootCAHashes.js     |   3 +-
 .../scripts/genHPKPStaticPins.js              |   7 +-
 .../scripts/getHSTSPreloadList.js             |   2 +-
 toolkit/xre/test/win/Makefile.in              |   2 +-
 9 files changed, 9 insertions(+), 369 deletions(-)
 delete mode 100755 build/unix/run-mozilla.sh

diff --git a/build/unix/moz.build b/build/unix/moz.build
index 259e7e9c7dcb..4d556b6aaf2a 100644
--- a/build/unix/moz.build
+++ b/build/unix/moz.build
@@ -6,7 +6,3 @@
 
 if CONFIG["USE_ELF_HACK"] or CONFIG["RELRHACK"]:
     DIRS += ["elfhack"]
-
-FINAL_TARGET_FILES += [
-    "run-mozilla.sh",
-]
diff --git a/build/unix/run-mozilla.sh b/build/unix/run-mozilla.sh
deleted file mode 100755
index 32f309802b0a..000000000000
--- a/build/unix/run-mozilla.sh
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/bin/sh
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-cmdname=`basename "$0"`
-MOZ_DIST_BIN=`dirname "$0"`
-MOZ_DEFAULT_NAME="./${cmdname}-bin"
-MOZ_APPRUNNER_NAME="./mozilla-bin"
-MOZ_PROGRAM=""
-
-exitcode=1
-#
-##
-## Functions
-##
-##########################################################################
-moz_usage()
-{
-echo "Usage:  ${cmdname} [options] [program]"
-echo ""
-echo "  options:"
-echo ""
-echo "    -g                   Run in debugger."
-echo "    --debug"
-echo ""
-echo "    -d debugger          Debugger to use."
-echo "    --debugger debugger"
-echo ""
-echo "    -a debugger_args     Arguments passed to [debugger]."
-echo "    --debugger-args debugger_args"
-echo ""
-echo "  Examples:"
-echo ""
-echo "  Run the mozilla-bin binary"
-echo ""
-echo "    ${cmdname} mozilla-bin"
-echo ""
-echo "  Debug the mozilla-bin binary in gdb"
-echo ""
-echo "    ${cmdname} -g mozilla-bin -d gdb"
-echo ""
-echo "  Run mozilla-bin under valgrind with arguments"
-echo ""
-echo "    ${cmdname} -g -d valgrind -a '--tool=memcheck --leak-check=full' mozilla-bin"
-echo ""
-	return 0
-}
-##########################################################################
-moz_bail()
-{
-	message=$1
-	echo
-	echo "$cmdname: $message"
-	echo
-	exit 1
-}
-##########################################################################
-moz_test_binary()
-{
-	binary=$1
-	if [ -f "$binary" ]
-	then
-		if [ -x "$binary" ]
-		then
-			return 1
-		fi
-	fi
-	return 0
-}
-##########################################################################
-moz_get_debugger()
-{
-	debuggers="ddd gdb dbx bdb native-gdb"
-	debugger="notfound"
-	done="no"
-	for d in $debuggers
-	do
-		moz_test_binary /bin/which
-		if [ $? -eq 1 ]
-		then
-			dpath=`which ${d}`	
-		else 	
-			dpath=`LC_MESSAGES=C type ${d} | awk '{print $3;}' | sed -e 's/\.$//'`	
-		fi
-		if [ -x "$dpath" ]
-		then
-			debugger=$dpath
-			break
-		fi
-	done
-	echo $debugger
-	return 0
-}
-##########################################################################
-moz_run_program()
-{
-	prog=$MOZ_PROGRAM
-	##
-	## Make sure the program is executable
-	##
-	if [ ! -x "$prog" ]
-	then
-		moz_bail "Cannot execute $prog."
-	fi
-	##
-	## Run the program
-	##
-	exec "$prog" ${1+"$@"}
-	exitcode=$?
-}
-##########################################################################
-moz_debug_program()
-{
-	prog=$MOZ_PROGRAM
-	##
-	## Make sure the program is executable
-	##
-	if [ ! -x "$prog" ]
-	then
-		moz_bail "Cannot execute $prog."
-	fi
-	if [ -n "$moz_debugger" ]
-	then
-		moz_test_binary /bin/which
-		if [ $? -eq 1 ]
-		then	
-			debugger=`which $moz_debugger` 
-		else
-			debugger=`LC_MESSAGES=C type $moz_debugger | awk '{print $3;}' | sed -e 's/\.$//'` 
-		fi	
-	else
-		debugger=`moz_get_debugger`
-	fi
-    if [ -x "$debugger" ] 
-    then
-# If you are not using ddd, gdb and know of a way to convey the arguments 
-# over to the prog then add that here- Gagan Saksena 03/15/00
-        case `basename $debugger` in
-            native-gdb) echo "$debugger $moz_debugger_args --args $prog" ${1+"$@"}
-                exec "$debugger" $moz_debugger_args --args "$prog" ${1+"$@"}
-                exitcode=$?
-                ;;
-            gdb) echo "$debugger $moz_debugger_args --args $prog" ${1+"$@"}
-                exec "$debugger" $moz_debugger_args --args "$prog" ${1+"$@"}
-		exitcode=$?
-                ;;
-            ddd) echo "$debugger $moz_debugger_args --gdb -- --args $prog" ${1+"$@"}
-		exec "$debugger" $moz_debugger_args --gdb -- --args "$prog" ${1+"$@"}
-		exitcode=$?
-                ;;
-            *) echo "$debugger $moz_debugger_args $prog ${1+"$@"}"
-                exec $debugger $moz_debugger_args "$prog" ${1+"$@"}
-		exitcode=$?
-                ;;
-        esac
-    else
-        moz_bail "Could not find a debugger on your system."
-    fi
-}
-##########################################################################
-##
-## Command line arg defaults
-##
-moz_debug=0
-moz_debugger=""
-moz_debugger_args=""
-#
-##
-## Parse the command line
-##
-while [ $# -gt 0 ]
-do
-  case $1 in
-    -g | --debug)
-      moz_debug=1
-      shift
-      ;;
-    -d | --debugger)
-      moz_debugger=$2;
-      if [ "${moz_debugger}" != "" ]; then
-	shift 2
-      else
-        echo "-d requires an argument"
-        exit 1
-      fi
-      ;;
-    -a | --debugger-args)
-      moz_debugger_args=$2;
-      if [ "${moz_debugger_args}" != "" ]; then
-	shift 2
-      else
-        echo "-a requires an argument"
-        exit 1
-      fi
-      ;;
-    *)
-      break;
-      ;;
-  esac
-done
-#
-##
-## Program name given in $1
-##
-if [ $# -gt 0 ]
-then
-	MOZ_PROGRAM=$1
-	shift
-fi
-##
-## Program not given, try to guess a default
-##
-if [ -z "$MOZ_PROGRAM" ]
-then
-	##
-	## Try this script's name with '-bin' appended
-	##
-	if [ -x "$MOZ_DEFAULT_NAME" ]
-	then
-		MOZ_PROGRAM=$MOZ_DEFAULT_NAME
-	##
-	## Try mozilla-bin
-	## 
-	elif [ -x "$MOZ_APPRUNNER_NAME" ]
-	then
-		MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
-	fi
-fi
-#
-#
-##
-## Make sure the program is executable
-##
-if [ ! -x "$MOZ_PROGRAM" ]
-then
-	moz_bail "Cannot execute $MOZ_PROGRAM."
-fi
-#
-if [ -z "$MRE_HOME" ]; then
-    MRE_HOME=$MOZ_DIST_BIN
-fi
-##
-## Set LD_LIBRARY_PATH
-##
-## On Solaris we use $ORIGIN (set in RUNPATH) instead of LD_LIBRARY_PATH 
-## to locate shared libraries. 
-##
-## When a shared library is a symbolic link, $ORIGIN will be replaced with
-## the real path (i.e., what the symbolic link points to) by the runtime
-## linker.  For example, if dist/bin/libxul.so is a symbolic link to
-## toolkit/library/libxul.so, $ORIGIN will be "toolkit/library" instead of "dist/bin".
-## So the runtime linker will use "toolkit/library" NOT "dist/bin" to locate the
-## other shared libraries that libxul.so depends on.  This only happens
-## when a user (developer) tries to start firefox, thunderbird, or seamonkey
-## under dist/bin. To solve the problem, we should rely on LD_LIBRARY_PATH
-## to locate shared libraries.
-##
-## Note: 
-##  We test $MOZ_DIST_BIN/*.so. If any of them is a symbolic link,
-##  we need to set LD_LIBRARY_PATH.
-##########################################################################
-moz_should_set_ld_library_path()
-{
-	[ `uname -s` != "SunOS" ] && return 0
-	for sharedlib in $MOZ_DIST_BIN/*.so
-	do
-		[ -h $sharedlib ] && return 0
-	done
-	return 1
-}
-if moz_should_set_ld_library_path
-then
-	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}
-fi 
-
-if [ -n "$LD_LIBRARYN32_PATH" ]
-then
-	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH:+":$LD_LIBRARYN32_PATH"}
-fi
-if [ -n "$LD_LIBRARYN64_PATH" ]
-then
-	LD_LIBRARYN64_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN64_PATH:+":$LD_LIBRARYN64_PATH"}
-fi
-if [ -n "$LD_LIBRARY_PATH_64" ]; then
-	LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH_64:+":$LD_LIBRARY_PATH_64"}
-fi
-
-#
-## Set DYLD_LIBRARY_PATH for Mac OS X (Darwin)
-DYLD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MRE_HOME}${DYLD_LIBRARY_PATH:+":$DYLD_LIBRARY_PATH"}
-#
-## Solaris Xserver(Xsun) tuning - use shared memory transport if available
-if [ "$XSUNTRANSPORT" = "" ]
-then 
-        XSUNTRANSPORT="shmem" 
-        XSUNSMESIZE="512"
-        export XSUNTRANSPORT XSUNSMESIZE
-fi
-
-# Disable Gnome crash dialog
-GNOME_DISABLE_CRASH_DIALOG=1
-export GNOME_DISABLE_CRASH_DIALOG
-
-if [ "$moz_debug" -eq 1 ]
-then
-  echo "  LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-  if [ -n "$LD_LIBRARYN32_PATH" ]
-  then
-  	echo "LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH"
-  fi
-  if [ -n "$LD_LIBRARYN64_PATH" ]
-  then
-  	echo "LD_LIBRARYN64_PATH=$LD_LIBRARYN64_PATH"
-  fi
-  if [ -n "$LD_LIBRARY_PATH_64" ]; then
-  	echo "LD_LIBRARY_PATH_64=$LD_LIBRARY_PATH_64"
-  fi
-  if [ -n "$DISPLAY" ]; then
-       echo "DISPLAY=$DISPLAY"
-  fi
-  if [ -n "$FONTCONFIG_PATH" ]; then
-	echo "FONTCONFIG_PATH=$FONTCONFIG_PATH"
-  fi
-  if [ -n "$MOZILLA_POSTSCRIPT_PRINTER_LIST" ]; then
-       echo "MOZILLA_POSTSCRIPT_PRINTER_LIST=$MOZILLA_POSTSCRIPT_PRINTER_LIST"
-  fi
-  echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH"
-  echo "     LIBRARY_PATH=$LIBRARY_PATH"
-  echo "       SHLIB_PATH=$SHLIB_PATH"
-  echo "          LIBPATH=$LIBPATH"
-  echo "       ADDON_PATH=$ADDON_PATH"
-  echo "      MOZ_PROGRAM=$MOZ_PROGRAM"
-  echo "      MOZ_TOOLKIT=$MOZ_TOOLKIT"
-  echo "        moz_debug=$moz_debug"
-  echo "     moz_debugger=$moz_debugger"
-  echo "moz_debugger_args=$moz_debugger_args"
-fi
-#
-export LD_LIBRARY_PATH
-export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
-
-if [ $moz_debug -eq 1 ]
-then
-	moz_debug_program ${1+"$@"}
-else
-	moz_run_program ${1+"$@"}
-fi
-
-exit $exitcode
diff --git a/config/config.mk b/config/config.mk
index a86733519ea9..79ad49560cb2 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -398,10 +398,6 @@ endif # ! relativesrcdir
 MERGE_FILE = $(LOCALE_SRCDIR)/$(1)
 MERGE_RELATIVE_FILE = $(call EXPAND_LOCALE_SRCDIR,$(2))/$(1)
 
-ifneq (WINNT,$(OS_ARCH))
-RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
-endif # ! WINNT
-
 # Enable verbose logs when not using `make -s`
 ifeq (,$(findstring s, $(filter-out --%, $(MAKEFLAGS))))
 export BUILD_VERBOSE_LOG = 1
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index aff4bc2b2fad..22c4251098b9 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -43,7 +43,7 @@ check-js-msg::
 	(cd $(topsrcdir) && $(PYTHON3) $(topsrcdir)/config/check_js_msg_encoding.py);
 
 check-jit-test::
-	$(JITTEST_SANITIZER_ENV) $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/jit-test/jit_test.py \
+	$(JITTEST_SANITIZER_ENV) $(PYTHON3) -u $(srcdir)/jit-test/jit_test.py \
 	        --no-slow --no-progress --format=automation --jitflags=all \
 			$(JITTEST_VALGRIND_FLAG) \
 			$(JITTEST_EXTRA_ARGS) \
@@ -52,7 +52,7 @@ check-jit-test::
 check:: check-js-msg
 
 check-jstests:
-	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \
+	$(PYTHON3) -u $(srcdir)/tests/jstests.py \
 		--no-progress --format=automation --timeout 300 \
 		$(JSTESTS_EXTRA_ARGS) \
 		$(DIST)/bin/js$(BIN_SUFFIX)
diff --git a/security/manager/tools/dumpGoogleRoots.js b/security/manager/tools/dumpGoogleRoots.js
index 464febacc53b..9ae48cbcc5aa 100644
--- a/security/manager/tools/dumpGoogleRoots.js
+++ b/security/manager/tools/dumpGoogleRoots.js
@@ -9,7 +9,7 @@
 // How to run this file:
 // 1. [obtain firefox source code]
 // 2. [build/obtain firefox binaries]
-// 3. run `[path to]/run-mozilla.sh [path to]/xpcshell dumpGoogleRoots.js'
+// 3. run `[path to]/firefox -xpcshell dumpGoogleRoots.js'
 // 4. [paste the output into the appropriate section in
 //     security/manager/tools/PreloadedHPKPins.json]
 
diff --git a/security/manager/tools/genRootCAHashes.js b/security/manager/tools/genRootCAHashes.js
index be0233a0c094..4c5df4bd18a0 100644
--- a/security/manager/tools/genRootCAHashes.js
+++ b/security/manager/tools/genRootCAHashes.js
@@ -6,8 +6,7 @@
 // How to run this file:
 // 1. [obtain firefox source code]
 // 2. [build/obtain firefox binaries]
-// 3. run `[path to]/run-mozilla.sh [path to]/xpcshell genRootCAHashes.js \
-//                                  [absolute path to]/RootHashes.inc'
+// 3. run `[path to]/firefox -xpcshell genRootCAHashes.js [absolute path to]/RootHashes.inc'
 
 const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
 const CertDb = Cc[nsX509CertDB].getService(Ci.nsIX509CertDB);
diff --git a/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js b/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js
index 7037a6f72cd6..6db7e9caec77 100644
--- a/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js
+++ b/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js
@@ -5,10 +5,9 @@
 // How to run this file:
 // 1. [obtain firefox source code]
 // 2. [build/obtain firefox binaries]
-// 3. run `[path to]/run-mozilla.sh [path to]/xpcshell \
-//                                  [path to]/genHPKPStaticpins.js \
-//                                  [absolute path to]/PreloadedHPKPins.json \
-//                                  [absolute path to]/StaticHPKPins.h
+// 3. run `[path to]/fireffox -xpcshell [path to]/genHPKPStaticpins.js \
+//                                      [absolute path to]/PreloadedHPKPins.json \
+//                                      [absolute path to]/StaticHPKPins.h
 "use strict";
 
 if (arguments.length != 2) {
diff --git a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js
index b695f0dd9077..9639dfa38b3c 100644
--- a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js
+++ b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js
@@ -4,7 +4,7 @@
 // How to run this file:
 // 1. [obtain firefox source code]
 // 2. [build/obtain firefox binaries]
-// 3. run `[path to]/run-mozilla.sh [path to]/xpcshell [path to]/getHSTSPreloadlist.js [absolute path to]/nsSTSPreloadlist.inc'
+// 3. run `[path to]/firefox -xpcshell [path to]/getHSTSPreloadlist.js [absolute path to]/nsSTSPreloadlist.inc'
 // Note: Running this file outputs a new nsSTSPreloadlist.inc in the current
 //       working directory.
 
diff --git a/toolkit/xre/test/win/Makefile.in b/toolkit/xre/test/win/Makefile.in
index 5a67b8eac8bb..e8486588b7bd 100644
--- a/toolkit/xre/test/win/Makefile.in
+++ b/toolkit/xre/test/win/Makefile.in
@@ -8,4 +8,4 @@ include $(topsrcdir)/config/rules.mk
 
 check::
 	@echo 'Running TestXREMakeCommandLineWin tests'
-	@$(RUN_TEST_PROGRAM) $(FINAL_TARGET)/TestXREMakeCommandLineWin.exe
+	@$(FINAL_TARGET)/TestXREMakeCommandLineWin.exe