Fix the failing CI/CD after the scripts were moved

Author: Simon Inns

scripts/test-chroma

@@ -33,12 +33,19 @@
 
 import argparse
 import os
+import shutil
 import statistics
 import subprocess
 import sys
 
 build_dir = None
 
+def resolve_tool(*candidates):
+    for path in candidates:
+        if os.path.exists(path):
+            return path
+    return candidates[0]
+
 def safe_unlink(filename):
     """Remove a file if it exists; if not, do nothing."""
 
@@ -97,7 +104,10 @@ def test_encode(args, source, sc_locked, png_suffix):
 
     # Encode the .rgb to .tbc, using ld-chroma-encoder
     tbc_file = args.output + '.tbc'
-    cmd = [build_dir + '/src/ld-chroma-decoder/encoder/ld-chroma-encoder']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'ld-chroma-encoder'),
+        os.path.join(build_dir, 'src', 'ld-chroma-decoder', 'encoder', 'ld-chroma-encoder'),
+    )]
     cmd += ['--input-format', args.input_format]
     if sc_locked:
         cmd += ['--sc-locked']
@@ -131,7 +141,10 @@ def test_decode(args, decoder, phase_locked, output_format, png_suffix):
     # Decode the .tbc using ld-chroma-decoder
     tbc_file = args.output + '.tbc'
     decoded_file = args.output + '.decoded'
-    cmd = [build_dir + '/src/ld-chroma-decoder/ld-chroma-decoder',
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'ld-chroma-decoder'),
+        os.path.join(build_dir, 'src', 'ld-chroma-decoder', 'ld-chroma-decoder'),
+    ),
         '--quiet',
         '-f', decoder,
         '--chroma-nr', '0',
@@ -218,6 +231,17 @@ def main():
     if args.build:
         build_dir = args.build
 
+    if shutil.which('ffmpeg') is None:
+        print('SKIP: ffmpeg not found in PATH')
+        sys.exit(77)
+
+    encoder_path = os.path.join(build_dir, 'src', 'ld-chroma-decoder', 'encoder', 'ld-chroma-encoder')
+    decoder_path = os.path.join(build_dir, 'src', 'ld-chroma-decoder', 'ld-chroma-decoder')
+    missing = [path for path in (encoder_path, decoder_path) if not os.path.exists(path)]
+    if missing:
+        print('SKIP: required tool(s) not built:', ', '.join(missing))
+        sys.exit(77)
+
     # Remove display environment variables, as the decoding tools shouldn't
     # depend on having a display
     for var in ('DISPLAY', 'WAYLAND_DISPLAY'):

scripts/test-decode-pretbc

@@ -36,6 +36,12 @@ dry_run = False
 source_dir = None
 build_dir = None
 
+def resolve_tool(*candidates):
+    for path in candidates:
+        if os.path.exists(path):
+            return path
+    return candidates[0]
+
 def die(*args):
     """Print an error message and exit."""
     print(*args, file=sys.stderr)
@@ -101,7 +107,10 @@ def run_ld_process_vbi(args):
 
     clean(args, ['.tbc.json.bup', '.tbc.db.bup'])
 
-    cmd = [build_dir + '/src/ld-process-vbi/ld-process-vbi']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'ld-process-vbi'),
+        os.path.join(build_dir, 'src', 'ld-process-vbi', 'ld-process-vbi'),
+    )]
     cmd += [args.output + '.tbc']
     run_command(cmd)
 
@@ -180,7 +189,10 @@ def run_ld_export_metadata(args):
 
     clean(args, ['.vits.csv', '.vbi.csv', '.ffmetadata'])
 
-    cmd = [build_dir + '/src/ld-export-metadata/ld-export-metadata']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'ld-export-metadata'),
+        os.path.join(build_dir, 'src', 'ld-export-metadata', 'ld-export-metadata'),
+    )]
     cmd += ['--vits-csv', args.output + '.vits.csv']
     cmd += ['--vbi-csv', args.output + '.vbi.csv']
     cmd += ['--ffmetadata', args.output + '.ffmetadata']
@@ -200,7 +212,10 @@ def run_ld_export_decode_metadata(args):
 
     clean(args, ['.tbc.export.json'])
 
-    cmd = [build_dir + '/src/ld-export-decode-metadata/ld-export-decode-metadata']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'ld-export-decode-metadata'),
+        os.path.join(build_dir, 'src', 'ld-export-decode-metadata', 'ld-export-decode-metadata'),
+    )]
     cmd += ['--input-sqlite', db_file]
     run_command(cmd)
 
@@ -318,19 +333,28 @@ def run_efm_decoder(args):
             die(efm_file, 'is empty')
 
     # Run efm-decoder-f2 (EFM T-values to F2 Section)
-    cmd = [build_dir + '/src/efm-decoder/tools/efm-decoder-f2/efm-decoder-f2']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'efm-decoder-f2'),
+        os.path.join(build_dir, 'src', 'efm-decoder', 'tools', 'efm-decoder-f2', 'efm-decoder-f2'),
+    )]
     if args.no_efm_timecodes:
         cmd += ['--no-timecodes']
     cmd += [efm_file, f2_file]
     run_command(cmd)
 
     # Run efm-decoder-d24 (F2 Section to Data24 Section)
-    cmd = [build_dir + '/src/efm-decoder/tools/efm-decoder-d24/efm-decoder-d24']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'efm-decoder-d24'),
+        os.path.join(build_dir, 'src', 'efm-decoder', 'tools', 'efm-decoder-d24', 'efm-decoder-d24'),
+    )]
     cmd += [f2_file, d24_file]
     run_command(cmd)
 
     # Run efm-decoder-audio (Data24 to Audio WAV)
-    cmd = [build_dir + '/src/efm-decoder/tools/efm-decoder-audio/efm-decoder-audio']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'efm-decoder-audio'),
+        os.path.join(build_dir, 'src', 'efm-decoder', 'tools', 'efm-decoder-audio', 'efm-decoder-audio'),
+    )]
     cmd += [d24_file, wav_file]
     run_command(cmd)
 
@@ -352,7 +376,10 @@ def run_ld_dropout_correct(args):
 
     clean(args, ['.doc.tbc', '.doc.tbc.db'])
 
-    cmd = [build_dir + '/src/ld-dropout-correct/ld-dropout-correct']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'ld-dropout-correct'),
+        os.path.join(build_dir, 'src', 'ld-dropout-correct', 'ld-dropout-correct'),
+    )]
     cmd += ['--overcorrect', args.output + '.tbc', args.output + '.doc.tbc']
     run_command(cmd)
 
@@ -362,7 +389,10 @@ def run_ld_chroma_decoder(args, decoder):
     clean(args, ['.rgb'])
     rgb_file = args.output + '.rgb'
 
-    cmd = [build_dir + '/src/ld-chroma-decoder/ld-chroma-decoder']
+    cmd = [resolve_tool(
+        os.path.join(build_dir, 'bin', 'ld-chroma-decoder'),
+        os.path.join(build_dir, 'src', 'ld-chroma-decoder', 'ld-chroma-decoder'),
+    )]
     if decoder is not None:
         cmd += ['--decoder', decoder]
     cmd += [args.output + '.doc.tbc', rgb_file]
@@ -447,6 +477,24 @@ def main():
         build_dir = args.build
     source_dir = build_dir
 
+    required_tools = [
+        os.path.join(build_dir, 'src', 'ld-process-vbi', 'ld-process-vbi'),
+        os.path.join(build_dir, 'src', 'ld-export-metadata', 'ld-export-metadata'),
+        os.path.join(build_dir, 'src', 'ld-export-decode-metadata', 'ld-export-decode-metadata'),
+        os.path.join(build_dir, 'src', 'ld-dropout-correct', 'ld-dropout-correct'),
+        os.path.join(build_dir, 'src', 'ld-chroma-decoder', 'ld-chroma-decoder'),
+    ]
+    if not args.no_efm:
+        required_tools += [
+            os.path.join(build_dir, 'src', 'efm-decoder', 'tools', 'efm-decoder-f2', 'efm-decoder-f2'),
+            os.path.join(build_dir, 'src', 'efm-decoder', 'tools', 'efm-decoder-d24', 'efm-decoder-d24'),
+            os.path.join(build_dir, 'src', 'efm-decoder', 'tools', 'efm-decoder-audio', 'efm-decoder-audio'),
+        ]
+    missing = [path for path in required_tools if not os.path.exists(path)]
+    if missing:
+        print('SKIP: required tool(s) not built:', ', '.join(missing), file=sys.stderr)
+        sys.exit(77)
+
     print('Processing', args.pretbc_input, 'using tools from', build_dir, file=sys.stderr)
 
     # Remove display environment variables, as the decoding tools shouldn't