diff --git a/macbuild/ReadMe.md b/macbuild/ReadMe.md
index f3b727f97..75a3c99c8 100644
--- a/macbuild/ReadMe.md
+++ b/macbuild/ReadMe.md
@@ -1,6 +1,6 @@
-Relevant KLayout version: 0.29.1
+Relevant KLayout version: 0.29.2
Author: Kazzz-S
-Last modified: 2024-05-01
+Last modified: 2024-06-09
# 1. Introduction
This directory **`macbuild`** contains various files required for building KLayout (http://www.klayout.de/) version 0.29.0 or later for different 64-bit macOS, including:
@@ -55,6 +55,7 @@ You need to have the followings:
* https://developer.apple.com/xcode/resources/
* https://mac.install.guide/commandlinetools/4
* Qt5 package from MacPorts or Anaconda3. Qt6, from Homebrew.
+* libgit2 form MacPorts, Homebrew,or Anaconda3.
* Optionally, Ruby and Python packages from MacPorts, Homebrew, or Anaconda3
#### For matching versions of Ruby and Python, please also refer to `build4mac_env.py`.
diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py
index a1f6ce69d..8f0e09dcc 100755
--- a/macbuild/build4mac_env.py
+++ b/macbuild/build4mac_env.py
@@ -182,7 +182,7 @@ RubySonoma = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions/
# install with 'sudo port install ruby33'
# [Key Type Name] = 'MP33'
Ruby33MacPorts = { 'exe': '/opt/local/bin/ruby3.3',
- 'inc': '/opt/local/include/ruby-3.3.1',
+ 'inc': '/opt/local/include/ruby-3.3.3',
'lib': '/opt/local/lib/libruby.3.3.dylib'
}
diff --git a/macbuild/nightlyBuild.py b/macbuild/nightlyBuild.py
index 3d6100b30..5732900ed 100755
--- a/macbuild/nightlyBuild.py
+++ b/macbuild/nightlyBuild.py
@@ -537,9 +537,9 @@ def Build_Deploy():
#------------------------------------------------------------------------------
## To run the QA tests
#
-# @param[in] exclude test to exclude such as 'pymod,pya'
+# @param[in] excludeList list of tests to exclude such as ['pymod', 'pya']
#------------------------------------------------------------------------------
-def Run_QATest( exclude ):
+def Run_QATest( excludeList ):
pyRunnerQAT = "./macQAT.py"
myPlatform = Test_My_Platform()
dirQAT = Get_QAT_Directory( Get_Build_Target_Dict(), myPlatform )
@@ -548,7 +548,13 @@ def Run_QATest( exclude ):
if key == "ana3" and qttype == 6: # anaconda3 does not provide Qt6 so far
continue
- command1 = [ pyRunnerQAT ] + [ '--run', '--exclude', '%s' % exclude ]
+ if key == "ana3":
+ excludeList += ['pymod']
+ exclude = ",".join( sorted( set(excludeList) ) )
+
+ command1 = [ pyRunnerQAT ] + [ '--run' ]
+ if not exclude == "":
+ command1 += [ '--exclude', '%s' % exclude ]
print( dirQAT[(qttype, key)], command1 )
#continue
os.chdir( dirQAT[(qttype, key)] )
@@ -707,7 +713,7 @@ def Main():
if Build:
Build_Deploy()
if QATest:
- Run_QATest( 'pymod,pya' )
+ Run_QATest( [] ) # ex. ['pymod', 'pya']
if QACheck:
Check_QATest_Results( 20 )
elif MakeDMG: