internal/find_blender/find_blender.go

@@ -24,6 +24,8 @@ var (
 	ErrTimedOut            = errors.New("version check took too long")
 )
 
+const BlenderPathEnvVariable = "FLAMENCO_BLENDER_PATH"
+
 // blenderVersionTimeout is how long `blender --version` is allowed to take,
 // before timing out. This can be much slower than expected, when loading
 // Blender from shared storage on a not-so-fast NAS.
@@ -50,9 +52,9 @@ func FileAssociation() (string, error) {
 	return fileAssociation()
 }
 
-// EnvironmentVariable returns the content of the BLENDER_CMD environment variable.
+// EnvironmentVariable returns the full path of a Blender executable, if given as environment variable
 func EnvironmentVariable() string {
-	return os.Getenv("BLENDER_CMD")
+	return os.Getenv(BlenderPathEnvVariable)
 }
 
 func CheckBlender(ctx context.Context, exename string) (CheckBlenderResult, error) {

internal/find_blender/find_blender_test.go

@@ -49,10 +49,10 @@ func TestGetBlenderCommandFromEnvironment(t *testing.T) {
 	path := EnvironmentVariable()
 	assert.Equal(t, "", path)
 
-	// Try finding the blender path in the BLENDER_CMD environment variable
+	// Try finding the blender path in the environment variable
-	err := os.Setenv("BLENDER_CMD", "/path/specified/in/env/to/blender")
+	err := os.Setenv(BlenderPathEnvVariable, "/path/specified/in/env/to/blender")
 	if err != nil {
-		t.Fatal("Could not set BLENDER_CMD environment variable")
+		t.Fatal("Could not set blender executable in environment variable")
 	}
 
 	path = EnvironmentVariable()

internal/worker/command_blender.go

@@ -85,8 +85,8 @@ func (ce *CommandExecutor) cmdBlenderRenderCommand(
 	}
 
 	if crosspath.Dir(parameters.exe) == "." {
-		// No directory path given. Check that the executable can be found in the
+		// No directory path given. Check that the executable is set in an
-		// environment variable BLENDER_CMD or on the path.
+		// environment variable or can be found on the path.
 		if path := find_blender.EnvironmentVariable(); path != "" {
 			logger.Info().Str("path", path).Msg("found Blender in environment")
 			parameters.exe = path

internal/worker/command_blender_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/stretchr/testify/assert"
 
+	"projects.blender.org/studio/flamenco/internal/find_blender"
 	"projects.blender.org/studio/flamenco/pkg/api"
 )
 
@@ -88,10 +89,9 @@ func TestCmdBlenderFromEnvironment(t *testing.T) {
 
 	envExe := `D:\Blender_3.2_stable\blender.exe`
 
-	// This should use blender.exe from the BLENDER_CMD environment variable
+	err := os.Setenv(find_blender.BlenderPathEnvVariable, envExe)
-	err := os.Setenv("BLENDER_CMD", envExe)
 	if err != nil {
-		t.Fatal("Could not set BLENDER_CMD environment variable")
+		t.Fatal("Could not set blender executable in environment variable")
 	}
 
 	taskID := "c5dfdfab-4492-4ab1-9b38-8ca4cbd84a17"