Don't run stest in the python Makefile, add a note to run it by hand,…

… fix the conflict that ended up being committed, and make sure abort is added

python/Makefile

@@ -28,6 +28,10 @@ PYLINT_SRC = \
 #       ../cime_config/buildnml
 
 all: test black lint
+# ----------------------------------------------------------------
+# See the stest target about this issue
+	@echo "Run './run_ctsm_py_tests --sys' by hand afterwards"
+# ----------------------------------------------------------------
 	@echo
 	@echo
 	@echo "Successfully ran all standard tests"
@@ -40,7 +44,14 @@ utest: FORCE
 
 .PHONY: stest
 stest: FORCE
-	$(PYTHON) ./run_ctsm_py_tests $(TEST_ARGS) --sys
+# ----------------------------------------------------------------
+# EBK 2024-03-19: Comment out running here because of this issue:
+# https://github.com/ESCOMP/CTSM/pull/2363#issuecomment-1967884908
+#$(PYTHON) ./run_ctsm_py_tests $(TEST_ARGS) --sys
+# Instead run by hand which seems to be working for now...
+# ----------------------------------------------------------------
+	@echo "System tests currently don't run under Make so..."
+	@echo "Run './run_ctsm_py_tests --sys' by hand afterwards"
 
 .PHONY: lint
 lint: FORCE