This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 9f5854e016bdcbc44ae1f460e2f8fc6018d8cf81 (commit) via 8cd6d1e105031ba6a23c7f9cc5ff8e8bdc8a19c2 (commit) via 229d3362e4889c8c496920a515c3897ad15f3887 (commit) via afc3a0224e103f4bdb2ed2ade8e074e0cb230207 (commit) from 10a0d73364d35cbd10ce5497fb338c5f7a653ba4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9f5854e016bdcbc44ae1f460e2f8fc6018d8cf81 Author: Phil Carns <[email protected]> Date: Wed Aug 3 21:27:21 2011 -0500 comment out aesop bug to get make test to work commit 8cd6d1e105031ba6a23c7f9cc5ff8e8bdc8a19c2 Author: Phil Carns <[email protected]> Date: Wed Aug 3 21:14:05 2011 -0500 fix typo commit 229d3362e4889c8c496920a515c3897ad15f3887 Author: Phil Carns <[email protected]> Date: Wed Aug 3 21:08:46 2011 -0500 fix typo commit afc3a0224e103f4bdb2ed2ade8e074e0cb230207 Author: Phil Carns <[email protected]> Date: Wed Aug 3 21:08:04 2011 -0500 finish commenting out test-remote-mpi ----------------------------------------------------------------------- Summary of changes: .../aesop/parser/tests/blocking/lonely-pbranch4.ae | 3 +++ code/src/aesop/parser/tests/remote/module.mk.in | 2 +- code/src/common/resources/timer/test/timer2.ae | 2 +- code/src/state/test/rpc-size.ae | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/src/aesop/parser/tests/blocking/lonely-pbranch4.ae b/code/src/aesop/parser/tests/blocking/lonely-pbranch4.ae index e602b75..467f069 100644 --- a/code/src/aesop/parser/tests/blocking/lonely-pbranch4.ae +++ b/code/src/aesop/parser/tests/blocking/lonely-pbranch4.ae @@ -11,9 +11,12 @@ static __blocking void lonely_pbranch(void) pbranch { + /* FIXME: this does not compile! */ +#if 0 int localvar; localvar = rand(); +#endif ret1 = btest1(&a); if(ret1 != 0) diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index d3731ea..c7e023a 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -80,10 +80,10 @@ $(FULLMODNAME5).d: $(DIR_TESTREMOTE)/test-remote-buffer-response.aer REMOTE_TESTSRC += $(DIR_TESTREMOTE)/test-remote-mock.aer \ $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer \ - $(DIR_TESTREMOTE)/test-remote-mpi.aer \ $(DIR_TESTREMOTE)/test-remote-fault-injector.aer \ $(DIR_TESTREMOTE)/test-remote-service-stop.aer \ $(DIR_TESTREMOTE)/test-remote-buffer-response.aer + #$(DIR_TESTREMOTE)/test-remote-mpi.aer endif # BUILD_MPI diff --git a/code/src/common/resources/timer/test/timer2.ae b/code/src/common/resources/timer/test/timer2.ae index ebf2cce..c88b66f 100644 --- a/code/src/common/resources/timer/test/timer2.ae +++ b/code/src/common/resources/timer/test/timer2.ae @@ -42,7 +42,7 @@ int receiver_ret; static void done_callback(void *user_ptr, int ret) { - ae_context_t ctx = (ae_context_t)up; + ae_context_t ctx = (ae_context_t)user_ptr; done = 1; receiver_ret = ret; ae_poll_break(ctx); diff --git a/code/src/state/test/rpc-size.ae b/code/src/state/test/rpc-size.ae index 4348830..7447d2e 100644 --- a/code/src/state/test/rpc-size.ae +++ b/code/src/state/test/rpc-size.ae @@ -106,7 +106,7 @@ int dostuff_ret; static void done_callback(void *user_ptr, int ret) { - ae_context_t ctx = (ae_context_t)up; + ae_context_t ctx = (ae_context_t)user_ptr; dostuff_ret = ret; done = 1; ae_poll_break(ctx); hooks/post-receive -- Triton Repository