Fix spvmcc --dependency, --dependency-cpan options.

yuki-kimoto · Jan 7, 2025 · 29eb821 · 29eb821
1 parent 241167f
commit 29eb821
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/SPVM/Builder/Exe.pm b/lib/SPVM/Builder/Exe.pm
@@ -1148,7 +1148,14 @@ sub dump_dependency_cpan {
 
     my $version_string = $basic_type->get_version_string;
 
-    my $dependency_info = "SPVM::$class_name";
+    my $dependency_info;
+
+    if ($class_name eq "SPVM") {
+      $dependency_info = "SPVM";
+    }
+    else {
+      $dependency_info = "SPVM::$class_name";
+    }
 
     if (length $version_string) {
       $dependency_info .= " $version_string";

diff --git a/t/04_spvmcc/spvmcc.t b/t/04_spvmcc/spvmcc.t
@@ -54,7 +54,7 @@ my $dev_null = File::Spec->devnull;
     my $spvmcc_cmd = qq($^X -Mblib blib/script/spvmcc -B $build_dir -I $test_dir/lib/SPVM -I t/02_vm/lib/SPVM --dependency t/04_spvmcc/script/myapp.spvm);
     my $output = `$spvmcc_cmd`;
 
-    unlike($output, qr|^SPVM [\.\d]+$|m);
+    like($output, qr|^SPVM [\.\d]+$|m);
     like($output, qr|^TestCase::NativeAPI2 1\.002$|m);
     like($output, qr|^TestCase::Precompile 2\.005$|m);
     like($output, qr|^Byte$|m);