lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] git commit: Don't run Charmonizer tests
Date Mon, 17 Mar 2014 22:12:04 GMT
Repository: lucy-clownfish
Updated Branches:
  refs/heads/master c3585a3d1 -> b2657985b


Don't run Charmonizer tests


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/b2657985
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/b2657985
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/b2657985

Branch: refs/heads/master
Commit: b2657985b0165e4b07bcfa8d70253844a573d7ff
Parents: c3585a3
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Mon Mar 17 22:51:26 2014 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Mon Mar 17 22:51:26 2014 +0100

----------------------------------------------------------------------
 runtime/perl/buildlib/Clownfish/Build.pm        | 34 ++++----------------
 runtime/perl/lib/Clownfish/Test.pm              | 16 ---------
 runtime/perl/t/charmonizer/001-integers.t       | 21 ------------
 runtime/perl/t/charmonizer/002-func_macro.t     | 21 ------------
 runtime/perl/t/charmonizer/003-headers.t        | 21 ------------
 runtime/perl/t/charmonizer/004-large_files.t    | 21 ------------
 runtime/perl/t/charmonizer/005-unused_vars.t    | 21 ------------
 .../perl/t/charmonizer/006-variadic_macros.t    | 21 ------------
 runtime/perl/t/charmonizer/007-dirmanip.t       | 21 ------------
 9 files changed, 7 insertions(+), 190 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/buildlib/Clownfish/Build.pm
----------------------------------------------------------------------
diff --git a/runtime/perl/buildlib/Clownfish/Build.pm b/runtime/perl/buildlib/Clownfish/Build.pm
index 610828b..9a28a55 100644
--- a/runtime/perl/buildlib/Clownfish/Build.pm
+++ b/runtime/perl/buildlib/Clownfish/Build.pm
@@ -40,14 +40,12 @@ use Cwd qw( getcwd );
 
 my @BASE_PATH = __PACKAGE__->cf_base_path;
 
-my $CHARMONIZER_ORIG_DIR
-    = rel2abs( catdir( @BASE_PATH, updir(), updir(), 'charmonizer' ) );
-my $COMMON_SOURCE_DIR    = catdir( @BASE_PATH, 'common' );
-my $CHARMONIZER_C        = catfile( $COMMON_SOURCE_DIR, 'charmonizer.c' );
-my $CORE_SOURCE_DIR = catdir( @BASE_PATH, 'core' );
-my $CFC_DIR = catdir( @BASE_PATH, updir(), 'compiler', 'perl' );
-my $CFC_BUILD  = catfile( $CFC_DIR, 'Build' );
-my $LIB_DIR          = 'lib';
+my $COMMON_SOURCE_DIR = catdir( @BASE_PATH, 'common' );
+my $CHARMONIZER_C     = catfile( $COMMON_SOURCE_DIR, 'charmonizer.c' );
+my $CORE_SOURCE_DIR   = catdir( @BASE_PATH, 'core' );
+my $CFC_DIR           = catdir( @BASE_PATH, updir(), 'compiler', 'perl' );
+my $CFC_BUILD         = catfile( $CFC_DIR, 'Build' );
+my $LIB_DIR           = 'lib';
 
 sub new {
     my $self = shift->SUPER::new( recursive_test_files => 1, @_ );
@@ -83,23 +81,6 @@ sub _run_make {
     chdir $current_directory if $dir;
 }
 
-# Build the charmonizer tests.
-sub ACTION_charmonizer_tests {
-    my $self = shift;
-    $self->dispatch('charmony');
-    print "Building Charmonizer Tests...\n\n";
-    my $flags = join( " ",
-        $self->config('ccflags'),
-        @{ $self->extra_compiler_flags },
-        '-I' . rel2abs( getcwd() ),
-    );
-    $flags =~ s/"/\\"/g;
-    $self->_run_make(
-        dir  => $CHARMONIZER_ORIG_DIR,
-        args => [ "DEFS=$flags", "tests" ],
-    );
-}
-
 sub ACTION_cfc {
     my $self    = shift;
     my $old_dir = getcwd();
@@ -127,7 +108,7 @@ sub ACTION_copy_clownfish_includes {
 sub ACTION_clownfish {
     my $self = shift;
 
-    $self->dispatch('charmonizer_tests');
+    $self->dispatch('charmony');
     $self->dispatch('cfc');
 
     $self->SUPER::ACTION_clownfish;
@@ -288,7 +269,6 @@ sub _clean_prereq_builds {
             and die "Clownfish clean failed";
         chdir $old_dir;
     }
-    $self->_run_make( dir => $CHARMONIZER_ORIG_DIR, args => ['clean'] );
 }
 
 sub ACTION_clean {

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/lib/Clownfish/Test.pm
----------------------------------------------------------------------
diff --git a/runtime/perl/lib/Clownfish/Test.pm b/runtime/perl/lib/Clownfish/Test.pm
index 3e53eda..aad0681 100644
--- a/runtime/perl/lib/Clownfish/Test.pm
+++ b/runtime/perl/lib/Clownfish/Test.pm
@@ -18,22 +18,6 @@ use Clownfish;
 our $VERSION = '0.003000';
 $VERSION = eval $VERSION;
 
-package Clownfish::Test::TestCharmonizer;
-our $VERSION = '0.003000';
-$VERSION = eval $VERSION;
-use Config;
-use File::Spec::Functions qw( catfile updir );
-
-sub run_tests {
-    my $name = ucfirst shift;
-    $name =~ s/_([a-z])/\u$1/g;
-    my $path = catfile( 'charmonizer', "Test$name$Config{_exe}" );
-    if ( !-e $path ) {
-        $path = catfile( updir(), updir(), updir(), $path );
-    }
-    exec $path;
-}
-
 1;
 
 __END__

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/t/charmonizer/001-integers.t
----------------------------------------------------------------------
diff --git a/runtime/perl/t/charmonizer/001-integers.t b/runtime/perl/t/charmonizer/001-integers.t
deleted file mode 100644
index 2106a45..0000000
--- a/runtime/perl/t/charmonizer/001-integers.t
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-
-use Clownfish::Test;
-Clownfish::Test::TestCharmonizer::run_tests("integers");
-

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/t/charmonizer/002-func_macro.t
----------------------------------------------------------------------
diff --git a/runtime/perl/t/charmonizer/002-func_macro.t b/runtime/perl/t/charmonizer/002-func_macro.t
deleted file mode 100644
index 9f5d404..0000000
--- a/runtime/perl/t/charmonizer/002-func_macro.t
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-
-use Clownfish::Test;
-Clownfish::Test::TestCharmonizer::run_tests("func_macro");
-

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/t/charmonizer/003-headers.t
----------------------------------------------------------------------
diff --git a/runtime/perl/t/charmonizer/003-headers.t b/runtime/perl/t/charmonizer/003-headers.t
deleted file mode 100644
index a6084a3..0000000
--- a/runtime/perl/t/charmonizer/003-headers.t
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-
-use Clownfish::Test;
-Clownfish::Test::TestCharmonizer::run_tests("headers");
-

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/t/charmonizer/004-large_files.t
----------------------------------------------------------------------
diff --git a/runtime/perl/t/charmonizer/004-large_files.t b/runtime/perl/t/charmonizer/004-large_files.t
deleted file mode 100644
index 2198be1..0000000
--- a/runtime/perl/t/charmonizer/004-large_files.t
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-
-use Clownfish::Test;
-Clownfish::Test::TestCharmonizer::run_tests("large_files");
-

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/t/charmonizer/005-unused_vars.t
----------------------------------------------------------------------
diff --git a/runtime/perl/t/charmonizer/005-unused_vars.t b/runtime/perl/t/charmonizer/005-unused_vars.t
deleted file mode 100644
index d88675f..0000000
--- a/runtime/perl/t/charmonizer/005-unused_vars.t
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-
-use Clownfish::Test;
-Clownfish::Test::TestCharmonizer::run_tests("unused_vars");
-

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/t/charmonizer/006-variadic_macros.t
----------------------------------------------------------------------
diff --git a/runtime/perl/t/charmonizer/006-variadic_macros.t b/runtime/perl/t/charmonizer/006-variadic_macros.t
deleted file mode 100644
index 2170f5c..0000000
--- a/runtime/perl/t/charmonizer/006-variadic_macros.t
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-
-use Clownfish::Test;
-Clownfish::Test::TestCharmonizer::run_tests("variadic_macros");
-

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b2657985/runtime/perl/t/charmonizer/007-dirmanip.t
----------------------------------------------------------------------
diff --git a/runtime/perl/t/charmonizer/007-dirmanip.t b/runtime/perl/t/charmonizer/007-dirmanip.t
deleted file mode 100644
index 0739090..0000000
--- a/runtime/perl/t/charmonizer/007-dirmanip.t
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-
-use Clownfish::Test;
-Clownfish::Test::TestCharmonizer::run_tests("dir_manip");
-


Mime
View raw message