@@ -4,29 +4,26 @@ var expect_test_collector_saved_stdout
44var expect_test_collector_saved_stderr
55
66//Provides: expect_test_collector_before_test
7- //Requires: caml_global_data, caml_ml_channels
7+ //Requires: caml_ml_channel_redirect
88//Requires: expect_test_collector_saved_stderr, expect_test_collector_saved_stdout
99function expect_test_collector_before_test ( voutput , vstdout , vstderr ) {
10- expect_test_collector_saved_stderr = caml_ml_channels . get ( vstderr ) ;
11- expect_test_collector_saved_stdout = caml_ml_channels . get ( vstdout ) ;
12- var output = caml_ml_channels . get ( voutput ) ;
13- caml_ml_channels . set ( vstdout , output ) ;
14- caml_ml_channels . set ( vstderr , output ) ;
10+ expect_test_collector_saved_stderr = caml_ml_channel_redirect ( vstderr , voutput ) ;
11+ expect_test_collector_saved_stdout = caml_ml_channel_redirect ( vstdout , voutput ) ;
1512 return 0 ;
1613}
1714
1815//Provides: expect_test_collector_after_test
19- //Requires: caml_global_data, caml_ml_channels
16+ //Requires: caml_ml_channel_restore
2017//Requires: expect_test_collector_saved_stderr, expect_test_collector_saved_stdout
2118function expect_test_collector_after_test ( vstdout , vstderr ) {
22- caml_ml_channels . set ( vstdout , expect_test_collector_saved_stdout ) ;
23- caml_ml_channels . set ( vstderr , expect_test_collector_saved_stderr ) ;
19+ caml_ml_channel_restore ( vstdout , expect_test_collector_saved_stdout ) ;
20+ caml_ml_channel_restore ( vstderr , expect_test_collector_saved_stderr ) ;
2421 return 0 ;
2522}
2623
2724//Provides:caml_out_channel_pos_fd
28- //Requires: caml_global_data, caml_ml_channels
25+ //Requires: caml_ml_channel_get
2926function caml_out_channel_pos_fd ( chan ) {
30- var info = caml_ml_channels . get ( chan ) ;
27+ var info = caml_ml_channel_get ( chan ) ;
3128 return info . offset
3229}
0 commit comments