Skip to content

Commit

Permalink
make sure to not get wrong java location
Browse files Browse the repository at this point in the history
  • Loading branch information
henrypinkard committed Apr 9, 2024
1 parent d4696fc commit 1b89e0b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pycromanager/test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ def launch_mm_headless(install_mm):
config_file = os.path.join(mm_install_dir, 'MMConfig_demo.cfg')
print('Launching Micro-manager in headless mode.')

# MM doesn't ship with Java on Mac so allow it to be defined here
# MM doesn't ship with Java on Mac so allow it to be defined here if using mac os
java_loc = None
if "JAVA" in os.environ:
if "JAVA" in os.environ and sys.platform == "darwin":
java_loc = os.environ["JAVA"]

start_headless(mm_install_dir, config_file, java_loc=java_loc, debug=True)
Expand Down

0 comments on commit 1b89e0b

Please sign in to comment.