diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 79 | ||||
| -rw-r--r-- | test/ragel.d/gentests.sh | 16 |
3 files changed, 61 insertions, 37 deletions
diff --git a/Makefile.am b/Makefile.am index 848b25ae..35062b1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. - -SUBDIRS = colm ragel doc +SUBDIRS = colm ragel doc test DIST_SUBDIRS = $(SUBDIRS) aapl dist_doc_DATA = colm.vim diff --git a/configure.ac b/configure.ac index d1c060d2..0d1e7cdf 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,11 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_LIBTOOL +SED_SUBST=["\ + -e 's|@CXX@|${CXX}|g' \ + -e 's|@CC@|${CC}|g' \ +"] + dnl Set test on c++ compiler. AC_LANG_CPLUSPLUS @@ -118,6 +123,11 @@ COLM_LD='$(top_srcdir)/colm/libcolm.la' COLM_LIBDEP="${COLM_LD}" COLM_BINDEP="${COLM}" +SED_SUBST="$SED_SUBST -e 's|@COLM@|${COLM}|g'" +SED_SUBST="$SED_SUBST -e 's|@COLM_LD@|${COLM_LD}|g'" +SED_SUBST="$SED_SUBST -e 's|@COLM_LIBDEP@|${COLM_LIBDEP}|g'" +SED_SUBST="$SED_SUBST -e 's|@COLM_BINDEP@|${COLM_BINDEP}|g'" + AC_SUBST(COLM) AC_SUBST(COLM_LD) AC_SUBST(COLM_LIBDEP) @@ -179,6 +189,25 @@ AC_ARG_WITH(subject, ] ) +SED_SUBST="$SED_SUBST -e 's|@COLM_BIN@|${COLM_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@COLM_CPPFLAGS@|${COLM_CPPFLAGS}|g'" +SED_SUBST="$SED_SUBST -e 's|@COLM_LDFLAGS@|${COLM_LDFLAGS}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_BIN@|${RAGEL_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_CPPFLAGS@|${RAGEL_CPPFLAGS}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_LDFLAGS@|${RAGEL_LDFLAGS}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_LM@|${RAGEL_LM}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_C_BIN@|${RAGEL_C_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_D_BIN@|${RAGEL_D_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_JAVA_BIN@|${RAGEL_JAVA_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_RUBY_BIN@|${RAGEL_RUBY_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_CSHARP_BIN@|${RAGEL_CSHARP_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_GO_BIN@|${RAGEL_GO_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_OCAML_BIN@|${RAGEL_OCAML_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_ASM_BIN@|${RAGEL_ASM_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_RUST_BIN@|${RAGEL_RUST_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_CRACK_BIN@|${RAGEL_CRACK_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RAGEL_JULIA_BIN@|${RAGEL_JULIA_BIN}|g'" + AC_SUBST(AAPL_CPPFLAGS) AC_SUBST(COLM_BIN) @@ -190,41 +219,37 @@ AC_SUBST(RAGEL_CPPFLAGS) AC_SUBST(RAGEL_LDFLAGS) AC_SUBST(RAGEL_LM) +dnl +dnl Installed programs to test in +dnl + +AC_PATH_PROG([D_BIN], [gdc-5]) +AC_PATH_PROG([JAVAC_BIN], [javac]) +AC_PATH_PROG([RUBY_BIN], [ruby]) +AC_PATH_PROG([CSHARP_BIN], [mcs]) +AC_PATH_PROG([GO_BIN], [go]) +AC_PATH_PROG([OCAML_BIN], [ocaml]) +AC_PATH_PROG([RUST_BIN], [rustc]) +AC_PATH_PROG([JULIA_BIN], [julia]) + +SED_SUBST="$SED_SUBST -e 's|@D_BIN@|${D_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@JAVAC_BIN@|${JAVAC_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RUBY_BIN@|${RUBY_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@CSHARP_BIN@|${CSHARP_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@GO_BIN@|${GO_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@OCAML_BIN@|${OCAML_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@RUST_BIN@|${RUST_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@JULIA_BIN@|${JULIA_BIN}|g'" + AC_ARG_WITH(crack, [AC_HELP_STRING([--with-crack], [location of crack install])], [CRACK_BIN="$withval/bin/crack"], [AC_PATH_PROG([CRACK_BIN], [crack])] ) +SED_SUBST="$SED_SUBST -e 's|@CRACK_BIN@|${CRACK_BIN}|g'" AC_SUBST(CRACK_BIN) -SED_SUBST=["\ - -e 's|@CXX@|${CXX}|g' \ - -e 's|@CC@|${CC}|g' \ - -e 's|@COLM@|${COLM}|g' \ - -e 's|@COLM_LD@|${COLM_LD}|g' \ - -e 's|@COLM_LIBDEP@|${COLM_LIBDEP}|g' \ - -e 's|@COLM_BINDEP@|${COLM_BINDEP}|g' \ - -e 's|@COLM_BIN@|${COLM_BIN}|g' \ - -e 's|@COLM_CPPFLAGS@|${COLM_CPPFLAGS}|g' \ - -e 's|@COLM_LDFLAGS@|${COLM_LDFLAGS}|g' \ - -e 's|@RAGEL_BIN@|${RAGEL_BIN}|g' \ - -e 's|@RAGEL_CPPFLAGS@|${RAGEL_CPPFLAGS}|g' \ - -e 's|@RAGEL_LDFLAGS@|${RAGEL_LDFLAGS}|g' \ - -e 's|@RAGEL_LM@|${RAGEL_LM}|g' \ - -e 's|@RAGEL_C_BIN@|${RAGEL_C_BIN}|g' \ - -e 's|@RAGEL_D_BIN@|${RAGEL_D_BIN}|g' \ - -e 's|@RAGEL_JAVA_BIN@|${RAGEL_JAVA_BIN}|g' \ - -e 's|@RAGEL_RUBY_BIN@|${RAGEL_RUBY_BIN}|g' \ - -e 's|@RAGEL_CSHARP_BIN@|${RAGEL_CSHARP_BIN}|g' \ - -e 's|@RAGEL_GO_BIN@|${RAGEL_GO_BIN}|g' \ - -e 's|@RAGEL_OCAML_BIN@|${RAGEL_OCAML_BIN}|g' \ - -e 's|@RAGEL_ASM_BIN@|${RAGEL_ASM_BIN}|g' \ - -e 's|@RAGEL_RUST_BIN@|${RAGEL_RUST_BIN}|g' \ - -e 's|@RAGEL_CRACK_BIN@|${RAGEL_CRACK_BIN}|g' \ - -e 's|@RAGEL_JULIA_BIN@|${RAGEL_JULIA_BIN}|g' \ - -e 's|@CRACK_BIN@|${CRACK_BIN}|g' \ -"] AC_SUBST(SED_SUBST) diff --git a/test/ragel.d/gentests.sh b/test/ragel.d/gentests.sh index 1bc55d84..4cc30f4d 100644 --- a/test/ragel.d/gentests.sh +++ b/test/ragel.d/gentests.sh @@ -94,15 +94,15 @@ ragel="@RAGEL_BIN@" cxx_compiler="@CXX@" c_compiler="@CC@" objc_compiler="@CC@" -d_compiler="gdc-5" -java_compiler="javac" -ruby_engine="ruby" -csharp_compiler="mcs" -go_compiler="go" -ocaml_compiler="ocaml" -rust_compiler="rustc" +d_compiler="@D_BIN@" +java_compiler="@JAVAC_BIN@" +ruby_engine="@RUBY_BIN@" +csharp_compiler="@CSHARP_BIN@" +go_compiler="@GO_BIN@" +ocaml_compiler="@OCAML_BIN@" +rust_compiler="@RUST_BIN@" crack_interpreter="@CRACK_BIN@" -julia_interpreter="julia" +julia_interpreter="@JULIA_BIN@" function test_error { |