Skip to content
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.

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

Mac os integration #3539

Closed
Closed
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a0174c0
testing macOS 12
Oct 9, 2023
c5f714d
build-conda integration for mac
Oct 9, 2023
6a35a56
sourcing
Oct 23, 2023
0cc8570
Testing version
Oct 24, 2023
b87d0da
Testing not sourcing
Oct 24, 2023
f610b05
checking shell
Oct 24, 2023
df1efda
.bashrc
Oct 24, 2023
0334fee
returning to zsh for mac13
Oct 24, 2023
2799b9e
testing shell of macos13
Oct 30, 2023
0b25256
Testing permissions changes
Oct 30, 2023
e64ec2d
make sure permissions are added
Oct 30, 2023
74ef62f
make sure permissions are added fix
Oct 30, 2023
f318258
Merge branch 'master' into macOS-integration
Nov 6, 2023
9cd8986
testing pulling from current branch
Nov 13, 2023
4ea193e
didn't add integration
Nov 13, 2023
722fe49
Merge branch 'master' into macOS-integration
Jbrocket Nov 13, 2023
38b48d3
temporary quicker testing
Nov 14, 2023
1196351
corrected if statement
Nov 14, 2023
9d92c2e
cleaner integration and fixed zsh not found
Nov 14, 2023
79d42c9
testing
Nov 27, 2023
e9ffa44
testing singular makeflow dirs
Nov 28, 2023
9bbcaf9
running the correct test
Nov 28, 2023
0fc16a5
fixed name of file
Nov 28, 2023
ef9d895
added permissions
Nov 28, 2023
22b5a8a
more testing with conda env
Nov 28, 2023
cff3cbd
got rid of all tests again
Nov 28, 2023
7cca017
seeing the outputs in makeflow
Nov 28, 2023
94adea1
hello ls
Nov 28, 2023
697d464
added sleep to wait for process maybe
Nov 28, 2023
8d2f374
echos
Dec 5, 2023
c2bfed3
echo in test runner common
Dec 5, 2023
2da5c79
no longer waiting for file creation
Dec 5, 2023
1b43756
looking at the results
Dec 5, 2023
859b892
looking at ls one more time
Dec 5, 2023
d719cf7
forgot to commit this file
Dec 5, 2023
b48ecad
testing ls in own file
Dec 5, 2023
3d31601
small bug fix
Dec 5, 2023
97ce6c7
fixed another small bug
Dec 5, 2023
536ba65
checking whether machine is mac or not
Dec 5, 2023
59cbfa4
testing actual pipeline
Dec 5, 2023
c034e8b
something when wrong again booo
Dec 5, 2023
42f8062
cat
Dec 5, 2023
e0f7a42
got rid of something on accident
Dec 5, 2023
c710546
testing in regular pipeline
Dec 5, 2023
58a739c
oops
Dec 5, 2023
e1829c0
fixed type
Dec 5, 2023
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
Prev Previous commit
Next Next commit
echos
Jonathan Brockett authored and Jonathan Brockett committed Dec 5, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8d2f3744341f20d00e00fa5091b00567e71c2a36
2 changes: 1 addition & 1 deletion makeflow/test/TR_makeflow_001_dirs_01.sh
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
MAKE_FILE=dirs/testcase.subdir.01.makeflow

PRODUCTS="mydir/1.txt mydir/2.txt"

echo "HERE1"
. ./makeflow_dirs_test_common.sh

dispatch "$@"
10 changes: 5 additions & 5 deletions makeflow/test/makeflow_dirs_test_common.sh
Original file line number Diff line number Diff line change
@@ -21,22 +21,22 @@ run()
{
# send makeflow to the background, saving its exit status.
(../src/makeflow -d all -T vine -Z $PORT_FILE $MAKE_FILE; echo $? > $STATUS_FILE) &

echo "HERE2"
# wait at most 5 seconds for makeflow to find a port.
wait_for_file_creation $PORT_FILE 5

echo "HERE3"
run_taskvine_worker $PORT_FILE worker.log

echo "HERE4"
# wait for makeflow to exit.
wait_for_file_creation $STATUS_FILE 10

echo "HERE5"
# retrieve makeflow exit status
status=`cat $STATUS_FILE`
if [ $status -ne 0 ]
then
exit 1
fi

echo "HERE6"
# verify that makeflow created the required files from
# $MAKE_FILE
for file in $PRODUCTS