diff options
| author | Nishant Gupta <nish.gupta01@gmail.com> | 2016-08-02 23:40:25 +0530 |
|---|---|---|
| committer | Nishant Gupta <nish.gupta01@gmail.com> | 2016-08-02 23:40:25 +0530 |
| commit | 143091ee70347e88a71cb6e608b09b98632dbf5e (patch) | |
| tree | 82a6c25fe662fa33a1e054805fe504c30057cc9e | |
| parent | efd8d1972c6b6f884d29789e6b48dff7b76ffa8a (diff) | |
| download | swig-143091ee70347e88a71cb6e608b09b98632dbf5e.tar.gz | |
Test suite: run_testcase fixed and throw for std::string updated
| -rw-r--r-- | Examples/test-suite/hhvm/Makefile.in | 2 | ||||
| -rw-r--r-- | Lib/hhvm/std_string.i | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Examples/test-suite/hhvm/Makefile.in b/Examples/test-suite/hhvm/Makefile.in index eec626121..8e4d1880f 100644 --- a/Examples/test-suite/hhvm/Makefile.in +++ b/Examples/test-suite/hhvm/Makefile.in @@ -220,7 +220,7 @@ setup = \ # Runs the testcase. Tries to run testcase_runme.php. run_testcase = \ if [ -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile HHVM_SCRIPT=$(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL='$(RUNTOOL)' hhvm_run; \ + $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile HHVM_SCRIPT=$(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) TARGET='$*/$*' RUNTOOL='$(RUNTOOL)' hhvm_run; \ fi # Clean: remove testcase directories diff --git a/Lib/hhvm/std_string.i b/Lib/hhvm/std_string.i index 8c2b5616f..2f0dfc99d 100644 --- a/Lib/hhvm/std_string.i +++ b/Lib/hhvm/std_string.i @@ -48,7 +48,7 @@ class string; %typemap(argout) string & %{$result.assignIfRef(*$1);%} %typemap(throws) string, const string& %{ - throw HPHP::Object(HPHP::SystemLib::AllocRuntimeExceptionObject($1)); + HPHP::SystemLib::throwRuntimeExceptionObject($1); return; %} } |