From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QEg2i-0007pZ-Oi for garchives@archives.gentoo.org; Tue, 26 Apr 2011 11:02:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D09491C027; Tue, 26 Apr 2011 11:02:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 929331C036 for ; Tue, 26 Apr 2011 11:02:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1147B1B403C for ; Tue, 26 Apr 2011 11:02:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 228C380505 for ; Tue, 26 Apr 2011 11:02:28 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, /, test/ X-VCS-Repository: proj/libbash X-VCS-Files: Makefile.am scripts/arithmetic_assignment.bash scripts/arithmetic_assignment.bash.result scripts/arithmetic_assignment.ebuild scripts/arithmetic_assignment.ebuild.result scripts/binary_arithmetic.bash scripts/binary_arithmetic.bash.result scripts/binary_arithmetic.ebuild scripts/binary_arithmetic.ebuild.result scripts/command_execution.bash scripts/command_execution.bash.result scripts/command_execution.ebuild scripts/command_execution.ebuild.result scripts/function_def.bash scripts/function_def.bash.result scripts/function_def.ebuild scripts/function_def.ebuild.result scripts/var_def.bash scripts/var_def.bash.result scripts/var_def.ebuild scripts/var_def.ebuild.result scripts/var_expansion.bash scripts/var_expansion.bash.result scripts/var_expansion.ebuild scripts/var_expansion.ebuild.result test/verify_bashs_test.sh test/verify_ebuilds_test.sh X-VCS-Directories: scripts/ / test/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: f00e6f72d20808accabb22cf49c5489f118b7bc5 Date: Tue, 26 Apr 2011 11:02:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 51b75dec503980262459555f60302bab commit: f00e6f72d20808accabb22cf49c5489f118b7bc5 Author: Mu Qiao gentoo org> AuthorDate: Thu Apr 21 08:34:13 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Fri Apr 22 00:38:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Df00e6f72 Test: rename *ebuild* to *bash* The suffix is not proper when we want to distinguish normal shell scripts from ebuilds. So we rename these tests to make it possible to use metadata_generator as the compiler for *.ebuild. --- Makefile.am | 42 ++++++++++----= ------ ...ssignment.ebuild =3D> arithmetic_assignment.bash} | 0 ...ld.result =3D> arithmetic_assignment.bash.result} | 0 ...ry_arithmetic.ebuild =3D> binary_arithmetic.bash} | 0 ...ebuild.result =3D> binary_arithmetic.bash.result} | 0 ...and_execution.ebuild =3D> command_execution.bash} | 0 ...ebuild.result =3D> command_execution.bash.result} | 0 scripts/{function_def.ebuild =3D> function_def.bash} | 0 ..._def.ebuild.result =3D> function_def.bash.result} | 0 scripts/{var_def.ebuild =3D> var_def.bash} | 0 .../{var_def.ebuild.result =3D> var_def.bash.result} | 0 .../{var_expansion.ebuild =3D> var_expansion.bash} | 0 ...ion.ebuild.result =3D> var_expansion.bash.result} | 0 test/verify_bashs_test.sh | 5 ++ test/verify_ebuilds_test.sh | 5 -- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index c4f2507..03848ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ include doxygen.am =20 ACLOCAL_AMFLAGS =3D -I m4 =20 -TEST_EXTENSIONS=3D .gunit .ebuild +TEST_EXTENSIONS=3D .gunit .bash GUNIT_LOG_COMPILER =3D $(srcdir)/bashast/gunit/runtests.sh AM_GUNIT_LOG_FLAGS =3D @antlr_cp@:. GUNIT_TESTS =3D bashast/gunit/arith_main.gunit \ @@ -46,21 +46,21 @@ GUNIT_TESTS =3D bashast/gunit/arith_main.gunit \ bashast/gunit/simp_command.gunit \ bashast/gunit/simp_prog.gunit =20 -EBUILD_LOG_COMPILER =3D $(srcdir)/test/script_compiler.sh -EBUILD_TESTS =3D scripts/var_def.ebuild \ - scripts/var_expansion.ebuild \ - scripts/command_execution.ebuild \ - scripts/function_def.ebuild \ - scripts/arithmetic_assignment.ebuild \ - scripts/binary_arithmetic.ebuild -EBUILD_RESULT =3D scripts/var_def.ebuild.result \ - scripts/var_expansion.ebuild.result \ - scripts/command_execution.ebuild.result \ - scripts/function_def.ebuild.result \ - scripts/arithmetic_assignment.ebuild.result \ - scripts/binary_arithmetic.ebuild.result - -TESTS =3D $(GUNIT_TESTS) $(EBUILD_TESTS) +BASH_LOG_COMPILER =3D $(srcdir)/test/script_compiler.sh +BASH_TESTS =3D scripts/var_def.bash \ + scripts/var_expansion.bash \ + scripts/command_execution.bash \ + scripts/function_def.bash \ + scripts/arithmetic_assignment.bash \ + scripts/binary_arithmetic.bash +BASH_RESULT =3D scripts/var_def.bash.result \ + scripts/var_expansion.bash.result \ + scripts/command_execution.bash.result \ + scripts/function_def.bash.result \ + scripts/arithmetic_assignment.bash.result \ + scripts/binary_arithmetic.bash.result + +TESTS =3D $(GUNIT_TESTS) $(BASH_TESTS) # these get cleaned so only add autogenerated stuff or modify CLEANFILES check_JAVA =3D bashast/bashastLexer.java bashast/bashastParser.java AM_JAVACFLAGS =3D -classpath @antlr_cp@ @@ -85,7 +85,7 @@ AM_CPPFLAGS =3D -D_GLIBCXX_DEBUG endif =20 if HAVE_GTEST -TESTS +=3D cppunittests test/ast_printer_test.sh test/verify_ebuilds_tes= t.sh +TESTS +=3D cppunittests test/ast_printer_test.sh test/verify_bashs_test.= sh check_PROGRAMS =3D cppunittests =20 cppunittests_SOURCES =3D test/run_tests.cpp \ @@ -175,12 +175,12 @@ EXTRA_DIST =3D bashast/bashast.g \ bashast/features_script/features.sh.ast \ bashast/features_script/features.sh.tokens \ test/ast_printer_test.sh \ - test/verify_ebuilds_test.sh \ - $(EBUILD_TESTS) \ - $(EBUILD_RESULT) \ + test/verify_bashs_test.sh \ + $(BASH_TESTS) \ + $(BASH_RESULT) \ $(GUNIT_TESTS) \ $(GUNIT_LOG_COMPILER) \ - $(EBUILD_LOG_COMPILER) + $(BASH_LOG_COMPILER) =20 coding_standard.pdf: coding_standard/coding_standard.tex $(AM_V_GEN)@PDFLATEX@ coding_standard/coding_standard.tex 2&>1 > /dev/n= ull diff --git a/scripts/arithmetic_assignment.ebuild b/scripts/arithmetic_as= signment.bash similarity index 100% rename from scripts/arithmetic_assignment.ebuild rename to scripts/arithmetic_assignment.bash diff --git a/scripts/arithmetic_assignment.ebuild.result b/scripts/arithm= etic_assignment.bash.result similarity index 100% rename from scripts/arithmetic_assignment.ebuild.result rename to scripts/arithmetic_assignment.bash.result diff --git a/scripts/binary_arithmetic.ebuild b/scripts/binary_arithmetic= .bash similarity index 100% rename from scripts/binary_arithmetic.ebuild rename to scripts/binary_arithmetic.bash diff --git a/scripts/binary_arithmetic.ebuild.result b/scripts/binary_ari= thmetic.bash.result similarity index 100% rename from scripts/binary_arithmetic.ebuild.result rename to scripts/binary_arithmetic.bash.result diff --git a/scripts/command_execution.ebuild b/scripts/command_execution= .bash similarity index 100% rename from scripts/command_execution.ebuild rename to scripts/command_execution.bash diff --git a/scripts/command_execution.ebuild.result b/scripts/command_ex= ecution.bash.result similarity index 100% rename from scripts/command_execution.ebuild.result rename to scripts/command_execution.bash.result diff --git a/scripts/function_def.ebuild b/scripts/function_def.bash similarity index 100% rename from scripts/function_def.ebuild rename to scripts/function_def.bash diff --git a/scripts/function_def.ebuild.result b/scripts/function_def.ba= sh.result similarity index 100% rename from scripts/function_def.ebuild.result rename to scripts/function_def.bash.result diff --git a/scripts/var_def.ebuild b/scripts/var_def.bash similarity index 100% rename from scripts/var_def.ebuild rename to scripts/var_def.bash diff --git a/scripts/var_def.ebuild.result b/scripts/var_def.bash.result similarity index 100% rename from scripts/var_def.ebuild.result rename to scripts/var_def.bash.result diff --git a/scripts/var_expansion.ebuild b/scripts/var_expansion.bash similarity index 100% rename from scripts/var_expansion.ebuild rename to scripts/var_expansion.bash diff --git a/scripts/var_expansion.ebuild.result b/scripts/var_expansion.= bash.result similarity index 100% rename from scripts/var_expansion.ebuild.result rename to scripts/var_expansion.bash.result diff --git a/test/verify_bashs_test.sh b/test/verify_bashs_test.sh new file mode 100755 index 0000000..2c42195 --- /dev/null +++ b/test/verify_bashs_test.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +num_of_ebuild_files=3D$(grep 'scripts/.*.bash' $srcdir/Makefile.am | wc = -l) +[[ $num_of_ebuild_files =3D=3D $(ls $srcdir/scripts/*.bash* | wc -l) ]] +exit $? diff --git a/test/verify_ebuilds_test.sh b/test/verify_ebuilds_test.sh deleted file mode 100755 index 8aa84d6..0000000 --- a/test/verify_ebuilds_test.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -num_of_ebuild_files=3D$(grep 'scripts/.*.ebuild' $srcdir/Makefile.am | w= c -l) -[[ $num_of_ebuild_files =3D=3D $(ls $srcdir/scripts/*.ebuild* | wc -l) ]= ] -exit $?