Skip to content

Deploy --comp=COMP filter to test instruments including changed components #2238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willend merged 13 commits into from
Dec 7, 2025
Merged

Deploy --comp=COMP filter to test instruments including changed components #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2e27f0a
Enable mctest --comp=COMP in case of changed components
willend Dec 7, 2025
7577136
Add --comp=COMP test for McXtrace conda
willend Dec 7, 2025
5f35823
Use --comp=COMP in non-conda basictests
willend Dec 7, 2025
7f9ccdc
Trigger changed instr and changed comp tests
willend Dec 7, 2025
41e22b4
Add missing PERMISSIVE var definition
willend Dec 7, 2025
8f0e066
Put 'changed instrument' batch in ..
willend Dec 7, 2025
a470554
Try read_text with utf8
willend Dec 7, 2025
3cdddaa
Re-trigger change
willend Dec 7, 2025
03da736
Fix syntax
willend Dec 7, 2025
46defa0
Re-trigger changed instr/comps
willend Dec 7, 2025
86a5d78
Windows path change in 'changed instruments' batch
willend Dec 7, 2025
a27cd0e
Re-trigger
willend Dec 7, 2025
b5676dd
Fix missing McStas -> McXtrace / mcviewtest -> mxviewtest
willend Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions .github/workflows/mcstas-basictest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,35 +464,33 @@ jobs:
export MCSTAS_EXECUTABLE="mcstas"
export MCRUN_EXECUTABLE="mcrun"
export MCTEST_EXECUTABLE="mctest"
export PERMISSIVE=" "
export PATH=${PATH}:${PWD}/install_mcstas/bin/:${PWD}/install_mcstas/mcstas/3.99.99/bin/
# Check if any instr files were modified during last commit
cd src
export CHANGEDCOMPS=`git diff --name-only HEAD HEAD~1| grep \.comp\$ | grep mcstas-comps | xargs -n1 basename | sed s/\.comp//g | xargs echo`
export NUMCHANGEDCOMPS=`git diff --name-only HEAD HEAD~1|grep \.comp\$ | grep mcstas-comps | wc -l | xargs echo`
export COMPILIST=""
export RUNALL="NO"
if [ "$NUMCHANGEDCOMPS" != "0" ];
then
if [ "$NUMCHANGEDCOMPS" -lt "20" ];
then
for comp in $CHANGEDCOMPS;
do
echo Finding instruments matching component $comp
echo Finding tests including component $comp
NUMMATCH=`find mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l`
if [ "$NUMMATCH" -gt "0" ];
then
MATCH=`find mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | xargs -n1 basename | sed s/\.instr//g | xargs echo`
export COMPILIST=`echo $COMPILIST $MATCH`
if [ "$RUNNER_OS" != "Windows" ]; then
mctest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=${{ matrix.CC }}_CHANGES $PERMISSIVE
else
export COMPILIST=`echo $COMPILIST template_simple`
echo .\\install\\bin\\mctest --verbose --testdir run_${comp} --comp=${comp} --suffix=${{ matrix.CC }}_CHANGES --permissive >> ..\\changedinstr.bat
fi
done
else
export RUNALL="YES"
echo No matching tests found
fi
done
fi
export RUNALL="NO"
export CHANGEDINSTR=`git diff --name-only HEAD HEAD~1| grep \.instr\$ | grep mcstas-comps | xargs -n1 basename | sed s/\.instr//g | xargs echo`
export CHANGEDINSTR=`echo $CHANGEDINSTR $COMPILIST | xargs -n1 echo | sort | uniq | xargs echo | sed s/\ /,/g`
export CHANGEDINSTR=`echo $CHANGEDINSTR | xargs -n1 echo | sort | uniq | xargs echo | sed s/\ /,/g`
export NUMCHANGEDINSTR=`git diff --name-only HEAD HEAD~1|grep \.instr\$ | grep mcstas-comps | wc -l | xargs echo`
echo ----
echo $NUMCHANGEDCOMPS components and $NUMCHANGEDINSTR instruments were changed, resulting in this list:
Expand All @@ -503,24 +501,20 @@ jobs:
then
export RUNALL="YES"
fi
export PERMISSIVE=" "
if [ "$NUMCHANGEDINSTR" != "0" ] || [ "$NUMCHANGEDCOMPS" != "0" ];
if [ "$NUMCHANGEDINSTR" != "0" ];
then
if [ "$RUNALL" == "NO" ];
then
export SCOPE="--instr=$CHANGEDINSTR"
else
export SCOPE=" "
fi
mkdir run_mctest && cd run_mctest
if [ "$RUNNER_OS" != "Windows" ]; then
mkdir run_mctest && cd run_mctest
if [ "$RUNNER_OS" == macOS ]; then
export PERMISSIVE="--permissive"
fi
../install_mcstas/bin/${MCTEST_EXECUTABLE} --testdir $PWD $SCOPE --suffix=${{ matrix.CC }}_CHANGES $PERMISSIVE
mctest --mpi=2 --testdir $PWD $SCOPE --suffix=${{ matrix.CC }}_CHANGES $PERMISSIVE
mcviewtest --nobrowse $PWD
else
echo ..\\install\\bin\\mctest --verbose --testdir=. $SCOPE --suffix=${{ matrix.CC }}_CHANGES --permissive > changedinstr.bat
echo .\\install\\bin\\mctest --verbose --testdir=run_mctest $SCOPE --suffix=${{ matrix.CC }}_CHANGES --permissive >> ..\\changedinstr.bat
fi
fi

Expand All @@ -532,9 +526,7 @@ jobs:
shell: cmd
run: |
if exist changedinstr.bat (
mkdir run_mctest
cd run_mctest
call ..\changedinstr.bat
call .\changedinstr.bat
)

# Start of Windows tests
Expand Down
25 changes: 11 additions & 14 deletions .github/workflows/mcstas-conda-basictest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,35 +218,33 @@ jobs:
export MCSTAS_EXECUTABLE="mcstas"
export MCRUN_EXECUTABLE="mcrun"
export MCTEST_EXECUTABLE="mctest"
export PERMISSIVE=" "
export PATH=${PATH}:${PWD}/install_mcstas/bin/:${PWD}/install_mcstas/mcstas/3.99.99/bin/
# Check if any instr files were modified during last commit
cd src
export CHANGEDCOMPS=`git diff --name-only HEAD HEAD~1| grep \.comp\$ | grep mcstas-comps | xargs -n1 basename | sed s/\.comp//g | xargs echo`
export NUMCHANGEDCOMPS=`git diff --name-only HEAD HEAD~1|grep \.comp\$ | grep mcstas-comps | wc -l | xargs echo`
export COMPILIST=""
export RUNALL="NO"
if [ "$NUMCHANGEDCOMPS" != "0" ];
then
if [ "$NUMCHANGEDCOMPS" -lt "20" ];
then
for comp in $CHANGEDCOMPS;
do
echo Finding instruments matching component $comp
echo Finding tests including component $comp
NUMMATCH=`find mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l`
if [ "$NUMMATCH" -gt "0" ];
then
MATCH=`find mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | xargs -n1 basename | sed s/\.instr//g | xargs echo`
export COMPILIST=`echo $COMPILIST $MATCH`
if [ "$RUNNER_OS" != "Windows" ]; then
mctest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE
else
mctest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE
fi
else
export COMPILIST=`echo $COMPILIST template_simple`
echo No matching tests found
fi
done
else
export RUNALL="YES"
fi
fi
export RUNALL="NO"
export CHANGEDINSTR=`git diff --name-only HEAD HEAD~1| grep \.instr\$ | grep mcstas-comps | xargs -n1 basename | sed s/\.instr//g | xargs echo`
export CHANGEDINSTR=`echo $CHANGEDINSTR $COMPILIST | xargs -n1 echo | sort | uniq | xargs echo | sed s/\ /,/g`
export CHANGEDINSTR=`echo $CHANGEDINSTR | xargs -n1 echo | sort | uniq | xargs echo | sed s/\ /,/g`
export NUMCHANGEDINSTR=`git diff --name-only HEAD HEAD~1|grep \.instr\$ | grep mcstas-comps | wc -l | xargs echo`
echo ----
echo $NUMCHANGEDCOMPS components and $NUMCHANGEDINSTR instruments were changed, resulting in this list:
Expand All @@ -257,8 +255,7 @@ jobs:
then
export RUNALL="YES"
fi
export PERMISSIVE=" "
if [ "$NUMCHANGEDINSTR" != "0" ] || [ "$NUMCHANGEDCOMPS" != "0" ];
if [ "$NUMCHANGEDINSTR" != "0" ];
then
if [ "$RUNALL" == "NO" ];
then
Expand Down
36 changes: 14 additions & 22 deletions .github/workflows/mcxtrace-basictest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,35 +397,33 @@ jobs:
export MCXTRACE_EXECUTABLE="mcxtrace"
export MXRUN_EXECUTABLE="mxrun"
export MXTEST_EXECUTABLE="mxtest"
export PERMISSIVE=" "
export PATH=${PATH}:${PWD}/install_mcxtrace/bin/:${PWD}/install_mcxtrace/mcxtrace/3.99.99/bin/
# Check if any instr files were modified during last commit
cd src
export CHANGEDCOMPS=`git diff --name-only HEAD HEAD~1| grep \.comp\$ | grep mcxtrace-comps | xargs -n1 basename | sed s/\.comp//g | xargs echo`
export NUMCHANGEDCOMPS=`git diff --name-only HEAD HEAD~1|grep \.comp\$ | grep mcxtrace-comps | wc -l | xargs echo`
export COMPILIST=""
export RUNALL="NO"
if [ "$NUMCHANGEDCOMPS" != "0" ];
then
if [ "$NUMCHANGEDCOMPS" -lt "20" ];
then
for comp in $CHANGEDCOMPS;
do
echo Finding instruments matching component $comp
echo Finding tests including component $comp
NUMMATCH=`find mcxtrace-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l`
if [ "$NUMMATCH" -gt "0" ];
then
MATCH=`find mcxtrace-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | xargs -n1 basename | sed s/\.instr//g | xargs echo`
export COMPILIST=`echo $COMPILIST $MATCH`
if [ "$RUNNER_OS" != "Windows" ]; then
mxtest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=${{ matrix.CC }}_CHANGES $PERMISSIVE
else
export COMPILIST=`echo $COMPILIST template_simple`
echo .\\install\\bin\\mxtest --verbose --testdir run_${comp} --comp=${comp} --suffix=${{ matrix.CC }}_CHANGES --permissive >> ..\\changedinstr.bat
fi
done
else
export RUNALL="YES"
echo No matching tests found
fi
done
fi
export RUNALL="NO"
export CHANGEDINSTR=`git diff --name-only HEAD HEAD~1| grep \.instr\$ | grep mcxtrace-comps | xargs -n1 basename | sed s/\.instr//g | xargs echo`
export CHANGEDINSTR=`echo $CHANGEDINSTR $COMPILIST | xargs -n1 echo | sort | uniq | xargs echo | sed s/\ /,/g`
export CHANGEDINSTR=`echo $CHANGEDINSTR | xargs -n1 echo | sort | uniq | xargs echo | sed s/\ /,/g`
export NUMCHANGEDINSTR=`git diff --name-only HEAD HEAD~1|grep \.instr\$ | grep mcxtrace-comps | wc -l | xargs echo`
echo ----
echo $NUMCHANGEDCOMPS components and $NUMCHANGEDINSTR instruments were changed, resulting in this list:
Expand All @@ -436,24 +434,20 @@ jobs:
then
export RUNALL="YES"
fi
export PERMISSIVE=" "
if [ "$NUMCHANGEDINSTR" != "0" ] || [ "$NUMCHANGEDCOMPS" != "0" ];
if [ "$NUMCHANGEDINSTR" != "0" ];
then
if [ "$RUNALL" == "NO" ];
then
export SCOPE="--instr=$CHANGEDINSTR"
else
export SCOPE=" "
fi
mkdir run_mxtest && cd run_mxtest
if [ "$RUNNER_OS" != "Windows" ]; then
mkdir run_mxtest && cd run_mxtest
if [ "$RUNNER_OS" == macOS ]; then
export PERMISSIVE="--permissive"
fi
../install_mcxtrace/bin/${MXTEST_EXECUTABLE} --testdir $PWD $SCOPE --suffix=${{ matrix.CC }}_CHANGES $PERMISSIVE
mxtest --mpi=2 --testdir $PWD $SCOPE --suffix=${{ matrix.CC }}_CHANGES $PERMISSIVE
mxviewtest --nobrowse $PWD
else
echo ..\\install\\bin\\mxtest --verbose --testdir=. $SCOPE --suffix=${{ matrix.CC }}_CHANGES --permissive > changedinstr.bat
echo .\\install\\bin\\mxtest --verbose --testdir=run_mxtest $SCOPE --suffix=${{ matrix.CC }}_CHANGES --permissive >> ..\\changedinstr.bat
fi
fi

Expand All @@ -465,9 +459,7 @@ jobs:
shell: cmd
run: |
if exist changedinstr.bat (
mkdir run_mxtest
cd run_mxtest
call ..\changedinstr.bat
call .\changedinstr.bat
)

# Start of Windows tests
Expand Down
23 changes: 10 additions & 13 deletions .github/workflows/mcxtrace-conda-basictest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,35 +199,33 @@ jobs:
export MCXTRACE_EXECUTABLE="mcxtrace"
export MXRUN_EXECUTABLE="mxrun"
export MXTEST_EXECUTABLE="mxtest"
export PERMISSIVE=" "
export PATH=${PATH}:${PWD}/install_mcxtrace/bin/:${PWD}/install_mcxtrace/mcxtrace/3.99.99/bin/
# Check if any instr files were modified during last commit
cd src
export CHANGEDCOMPS=`git diff --name-only HEAD HEAD~1| grep \.comp\$ | grep mcxtrace-comps | xargs -n1 basename | sed s/\.comp//g | xargs echo`
export NUMCHANGEDCOMPS=`git diff --name-only HEAD HEAD~1|grep \.comp\$ | grep mcxtrace-comps | wc -l | xargs echo`
export COMPILIST=""
export RUNALL="NO"
if [ "$NUMCHANGEDCOMPS" != "0" ];
then
if [ "$NUMCHANGEDCOMPS" -lt "20" ];
then
for comp in $CHANGEDCOMPS;
do
echo Finding instruments matching component $comp
echo Finding tests including component $comp
NUMMATCH=`find mcxtrace-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l`
if [ "$NUMMATCH" -gt "0" ];
then
MATCH=`find mcxtrace-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | xargs -n1 basename | sed s/\.instr//g | xargs echo`
export COMPILIST=`echo $COMPILIST $MATCH`
if [ "$RUNNER_OS" != "Windows" ]; then
mxtest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE
else
export COMPILIST=`echo $COMPILIST template_simple`
mxtest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE
fi
done
else
export RUNALL="YES"
echo No matching tests found
fi
done
fi
export RUNALL="NO"
export CHANGEDINSTR=`git diff --name-only HEAD HEAD~1| grep \.instr\$ | grep mcxtrace-comps | xargs -n1 basename | sed s/\.instr//g | xargs echo`
export CHANGEDINSTR=`echo $CHANGEDINSTR $COMPILIST | xargs -n1 echo | sort | uniq | xargs echo | sed s/\ /,/g`
export CHANGEDINSTR=`echo $CHANGEDINSTR | xargs -n1 echo | sort | uniq | xargs echo | sed s/\ /,/g`
export NUMCHANGEDINSTR=`git diff --name-only HEAD HEAD~1|grep \.instr\$ | grep mcxtrace-comps | wc -l | xargs echo`
echo ----
echo $NUMCHANGEDCOMPS components and $NUMCHANGEDINSTR instruments were changed, resulting in this list:
Expand All @@ -238,8 +236,7 @@ jobs:
then
export RUNALL="YES"
fi
export PERMISSIVE=" "
if [ "$NUMCHANGEDINSTR" != "0" ] || [ "$NUMCHANGEDCOMPS" != "0" ];
if [ "$NUMCHANGEDINSTR" != "0" ];
then
if [ "$RUNALL" == "NO" ];
then
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mccodelib/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,13 +714,13 @@ def get_instr_comp_files(mydir, recursive=True, instrfilter=None, withcomp=None,
instrreg = re.compile(filter)
if instrreg.search(join(dirpath,f), re.IGNORECASE):
if withcomp is not None:
if withcomp in Path(join(dirpath, f)).read_text():
if withcomp in Path(join(dirpath, f)).read_text(encoding="utf8"):
files_instr.append(join(dirpath, f))
else:
files_instr.append(join(dirpath, f))
else:
if withcomp is not None:
if withcomp in Path(join(dirpath, f)).read_text():
if withcomp in Path(join(dirpath, f)).read_text(encoding="utf8"):
files_instr.append(join(dirpath, f))
else:
files_instr.append(join(dirpath, f))
Expand Down
Loading