diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index ab96034..f4ccaba 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,3 @@ ctags-5.8.tar.gz /ctags-p5.9.20221120.0.tar.gz /universal-ctags-6.0.0.tar.gz /universal-ctags-6.1.0.tar.gz -/universal-ctags-6.2.0.tar.gz -/universal-ctags-6.2.1.tar.gz diff --git a/ctags.spec b/ctags.spec index f4e4435..15636c1 100644 --- a/ctags.spec +++ b/ctags.spec @@ -1,6 +1,6 @@ Summary: A C programming language indexing and/or cross-reference tool Name: ctags -Version: 6.2.1 +Version: 6.1.0 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://ctags.io/ @@ -62,22 +62,6 @@ Install ctags if you are going to use your system for C programming. %{_mandir}/man7/* %changelog -* Wed Nov 12 2025 Than Ngo - 6.2.1-1 -- Update to 6.2.1 - -* Wed Sep 24 2025 Than Ngo - 6.2.0-1 -- Fix rhbz#2397816 - Update to 6.2.0 - -* Thu Jul 24 2025 Than Ngo - 6.1.0-4 -- Fix rhbz#2382883 - convert STI tests to TMT -- Fix test failure due to different outputs - -* Wed Jul 23 2025 Fedora Release Engineering - 6.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 6.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Wed Oct 23 2024 Than Ngo - 6.1.0-1 - update to 6.1.0 diff --git a/sources b/sources index da0080f..78e3a2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (universal-ctags-6.2.1.tar.gz) = 70e1767a72ba804cf4bc5e5c2dfe13498694c67865d5c8ca412d14b7f7f4c01410c94f7d57daad62ce5885166c4e05128d1beb8184f39a11596045a3f4131007 +SHA512 (universal-ctags-6.1.0.tar.gz) = 3e8b10bca1aef5d89e5fe7f1990d35766a33bb790e94f2015207589e4c9ad9bcc362ab5910e27a9f63cdbd6d9f291510fa73d1498331d5806dd93b7bba94d470 diff --git a/tests/Sanity-test-for-ctags/ctags-kinds-list b/tests/Sanity-test-for-ctags/ctags-kinds-list index c1b9b48..f65a590 100644 --- a/tests/Sanity-test-for-ctags/ctags-kinds-list +++ b/tests/Sanity-test-for-ctags/ctags-kinds-list @@ -31,6 +31,7 @@ Ada i loop/declare identifiers a automatic variables [off] y loops and blocks with no identifier [off] + S (ctags internal use) Ant p projects t targets @@ -49,7 +50,7 @@ Asm l labels m macros t types (structs and records) - z parameters for a macro [off] + s sections Asp d constants c classes @@ -81,7 +82,6 @@ Automake D datum c conditions s subdirs - p placeholder for EXTRA_, noinst_, and _check_ prefixed primaries (internal use) [off] Awk f functions Basic @@ -91,52 +91,11 @@ Basic t types v variables g enumerations - n namespace -Bats - t test cases - S scripts BETA f fragment definitions p all patterns [off] s slots (fragment uses) v patterns (virtual or rebound) -BibLaTeX - A artworks - B audios - C bibnotes - D bookinbooks - E Booklets - G collections - H commentarys - I datasets - J images - K interferences - L jurisdictions - M legislations - N legals - O letters - P movies - Q musics - R mvbooks - S mvcollections - T mvproceedings - U mvreferences - V onlines - W patents - g performances - h periodicals - i references - j reports - k reviews - l sets - m software - n standards - o suppbooks - p suppcollections - q suppperiodicals - r thesis - s videos - t xdatas BibTeX a article b book @@ -177,7 +136,7 @@ C u union names v variable definitions x external and forward variable declarations [off] - z function parameters inside function or prototype definitions [off] + z function parameters inside function definitions [off] L goto labels [off] D parameters inside macro definitions [off] C++ @@ -194,7 +153,7 @@ C++ u union names v variable definitions x external and forward variable declarations [off] - z function parameters inside function or prototype definitions [off] + z function parameters inside function definitions [off] L goto labels [off] D parameters inside macro definitions [off] c classes @@ -269,7 +228,7 @@ CUDA u union names v variable definitions x external and forward variable declarations [off] - z function parameters inside function or prototype definitions [off] + z function parameters inside function definitions [off] L goto labels [off] D parameters inside macro definitions [off] D @@ -326,8 +285,16 @@ Elixir r records (defrecord...) t tests (test ...) y types (@type ...) +Elm + m Module + n Renamed Imported Module + p Port + t Type Definition + c Type Constructor + a Type Alias + f Functions EmacsLisp - Y unknown type of definitions + u unknown type of definitions f functions v variables c constants @@ -367,10 +334,6 @@ Flex C constants I imports x mxtags -Forth - w words - v variables - c constants Fortran b block data c common blocks @@ -391,8 +354,6 @@ Fortran t derived types and structures v program (global) and module variables S submodules -FrontMatter - t titles FunctionParameters m methods f functions @@ -403,18 +364,6 @@ Gdbinit D documents [off] t toplevel variables l local variables [off] -GDScript - c classes - m methods - v variables - C constants - g enumeration names - e enumerated values - z function parameters [off] - l local variables [off] - s signals -GemSpec - g gems Go p packages f functions @@ -426,16 +375,10 @@ Go m struct members M struct anonymous members n interface method specification - Y unknown + u unknown P name for specifying imported package a type aliases R receivers [off] -GPerf - k keywords - h hash function names - l lookup function names - c class names - s string pool names Haskell t types c type constructors @@ -451,7 +394,6 @@ Haxe HTML a named anchors c classes - t titles h H1 headings i H2 headings j H3 headings @@ -468,8 +410,6 @@ Inko a Attribute definition c Constant definition r Reopen class -IPythonCell - c cells ITcl c classes m methods @@ -498,7 +438,6 @@ JavaScript g generators G getters S setters - M fields JSON o objects a arrays @@ -514,24 +453,20 @@ Julia n Modules s Structures t Types - Y name defined in other modules + x name defined in other modules Kconfig c configs m menus M the main menu k kconfig file C choices - v macro variables LdScript S sections s symbols v versions i input sections -LEX - r named regular expression - c start or exclusive condition Lisp - Y unknown type of definitions + u unknown type of definitions f functions v variables m macros @@ -543,27 +478,23 @@ LiterateHaskell m modules Lua f functions - Y unknown language object [off] M4 d macros I macro files Man t titles s sections - S sub sections Make m macros t targets I makefiles Markdown - c chapters + c chapsters s sections - S level 2 sections - t level 3 sections - T level 4 sections - u level 5 sections - n footnotes - h hashtags + S subsections + t subsubsections + T level 4 subsections + u level 5 subsections MatLab f function v variable @@ -577,14 +508,6 @@ Meson t tests b benchmark targets r run targets - m modules -MesonOptions - s strings - b booleans - c combos - i integers - a arrays - f features Moose c classes m methods @@ -623,6 +546,42 @@ ObjectiveC e An enumeration M A preprocessor macro C categories +OldC++ [disabled] + c classes + d macro definitions + e enumerators (values inside an enumeration) + f function definitions + g enumeration names + h included header files + l local variables [off] + m class, struct, and union members + n namespaces + p function prototypes [off] + s structure names + t typedefs + u union names + v variable definitions + x external and forward variable declarations [off] + L goto label [off] + D cpp macro parameters [off] +OldC [disabled] + c classes + d macro definitions + e enumerators (values inside an enumeration) + f function definitions + g enumeration names + h included header files + l local variables [off] + m class, struct, and union members + n namespaces + p function prototypes [off] + s structure names + t typedefs + u union names + v variable definitions + x external and forward variable declarations [off] + L goto label [off] + D cpp macro parameters [off] OCaml c classes m Object's method @@ -634,15 +593,6 @@ OCaml C A constructor r A 'structure' field e An exception -Org - d definitions - p parts - c chapters - s sections - u subsections - b subsubsections - P paragraphs - G subparagraphs Passwd u user names Pascal @@ -656,7 +606,6 @@ Perl s subroutines d subroutine declarations [off] M modules [off] - h marker for here document [off] Perl6 c classes g grammars @@ -678,10 +627,6 @@ PHP t traits v variables a aliases -PkgConfig - N display names - p packages - v variabels Pod c chapters s sections @@ -690,9 +635,6 @@ Pod PowerShell f functions v variables - c classes - i filter - g enum names Protobuf p packages m messages @@ -710,9 +652,6 @@ PuppetManifest n nodes r resources v variables - p parameters - V virtual resources - t type aliases Python c classes f functions @@ -720,7 +659,7 @@ Python v variables I name referring a module defined in other file i modules - Y name referring a class/variable/function/module defined in other module + x name referring a class/variable/function/module defined in other module z function parameters [off] l local variables [off] PythonLoggingConfig @@ -733,10 +672,6 @@ QtMoc s slots S signals p properties -Quarto - l chunk labels -RMarkdown - l chunk labels R f functions l libraries @@ -748,24 +683,6 @@ R L lists explicitly created with `list()' d data frame explicitly created with `data.frame()' n names attribtes in vectors, lists, or dataframes -Rake - t tasks - n namespaces - f file tasks - d directory tasks - m multi tasks - x tasks defined with special constructor -Raku - c classes - g grammars - m methods - o modules - p packages - r roles - u rules - b submethods - s subroutines - t tokens R6Class c classes m methods @@ -774,15 +691,12 @@ R6Class RSpec d describes c contexts - i things described with "it" REXX s subroutines Robot t testcases k keywords v variables -RpmMacros - m macros RpmSpec t tags m macros @@ -790,8 +704,6 @@ RpmSpec g global macros p patch files ReStructuredText - H titles - h sub titles c chapters s sections S subsections @@ -821,7 +733,6 @@ Rust m A struct field e An enum variant P A method - C A constant S4Class c classes r representations @@ -855,32 +766,29 @@ SML t type definitions v value bindings SQL - C PLSQL_CCFLAGS - D domains - E record fields - L block label - P packages - R services - S schemas - T triggers - U publications - V views - b database c cursors d prototypes [off] - e events f functions - i indexes + E record fields l local variables [off] - n synonyms + L block label + P packages p procedures r records [off] s subtypes t tables + T triggers v variables + i indexes + e events + U publications + R services + D domains + V views + n synonyms x MobiLink Table Scripts y MobiLink Conn Scripts - z MobiLink Properties + z MobiLink Properties SystemdUnit u units SystemTap @@ -895,14 +803,6 @@ Tcl TclOO c classes m methods -Terraform - r resources - d data - v variables - p providers - m modules - o output -TerraformVariables Tex p parts c chapters @@ -915,9 +815,6 @@ Tex i external input files B bibliography items C command created with \newcommand - o math operator created with \DeclareMathOperator - e environment created with \newenvironment - t theorem created with \newtheorem N counter created with \newcounter TeXBeamer f frametitles @@ -955,22 +852,6 @@ TypeScript C constants G generators a aliases -V - f functions - p modules - v variables - c constants - R receivers in functions - l labels - s structs - m struct/interface members - n interface methods - e enumerators (values inside an enumeration) - g enumeration names - a type aliases - i interfaces - u union names - Y unknown (imported) variables, types and functions Vera c classes d macro definitions @@ -990,8 +871,7 @@ Vera h included header files D cpp macro parameters [off] Verilog - c constants (parameter, specparam) - d text macros + c constants (define, parameter, specparam) e events f functions m modules @@ -1002,8 +882,7 @@ Verilog b blocks (begin, fork) i instances of module SystemVerilog - c constants (parameter, specparam, enum values) - d text macros + c constants (define, parameter, specparam, enum values) e events f functions m modules @@ -1069,7 +948,6 @@ WindRes v versions a accelerators YACC - t tokens l labels YumRepo r repository id @@ -1083,11 +961,6 @@ Zephir t traits v variables a aliases -Zsh - a aliases - f functions - s script files - h label for here document DBusIntrospect a arguments i interfaces @@ -1111,8 +984,6 @@ RelaxNG n named patterns SVG d ids in defs tags -XRC - o objects XML i id attributes n namespace prefixes @@ -1121,24 +992,12 @@ XSLT s stylesheets p parameters m matched template - n named template + n matched template v variables Yaml a anchors AnsiblePlaybook p plays -I18nRubyGem - k translation keys at the leafs - m the middle component of keys [off] - l the root element representing a locale [off] -OpenAPI - d schemas - p paths - R responses - P parameters - t titles - s servers (or hosts in swagger) - T tags Varlink i interfaces m methods @@ -1159,26 +1018,3 @@ Kotlin T typealiases C constants v variables -Thrift - s structs - x exceptions - u unions - n namespaces - e enumerators (values inside an enumeration) - g enumeration names - m members - C constants - t typedefs - v services - f functions - z parameters [off] - Z parameters in throws list [off] - T thrift files -Elm - m modules - n modules renamed - t types - c constructors - a aliases - p ports - f functions diff --git a/tests/Sanity-test-for-ctags/ctags-lang-list b/tests/Sanity-test-for-ctags/ctags-lang-list index 804037b..cd8a1ee 100644 --- a/tests/Sanity-test-for-ctags/ctags-lang-list +++ b/tests/Sanity-test-for-ctags/ctags-lang-list @@ -11,9 +11,7 @@ AutoIt Automake Awk Basic -Bats BETA -BibLaTeX BibTeX C C# @@ -40,24 +38,17 @@ EmacsLisp Erlang Falcon Flex -Forth Fortran -FrontMatter FunctionParameters Fypp Gdbinit -GDScript -GemSpec Glade Go -GPerf Haskell Haxe HTML -I18nRubyGem Iniconf Inko -IPythonCell ITcl Java JavaProperties @@ -67,7 +58,6 @@ Julia Kconfig Kotlin LdScript -LEX Lisp LiterateHaskell Lua @@ -78,20 +68,18 @@ Markdown MatLab Maven2 Meson -MesonOptions Moose Myrddin NSIS ObjectiveC OCaml -OpenAPI -Org +OldC [disabled] +OldC++ [disabled] Pascal Passwd Perl Perl6 PHP -PkgConfig PlistXML Pod PowerShell @@ -101,17 +89,12 @@ Python PythonLoggingConfig QemuHX QtMoc -Quarto R R6Class -Rake -Raku RelaxNG ReStructuredText REXX -RMarkdown Robot -RpmMacros RpmSpec RSpec Ruby @@ -129,16 +112,12 @@ SystemTap SystemVerilog Tcl TclOO -Terraform -TerraformVariables Tex TeXBeamer -Thrift TTCN Txt2tags TypeScript Unknown [disabled] -V Varlink Vera Verilog @@ -146,10 +125,8 @@ VHDL Vim WindRes XML -XRC XSLT YACC Yaml YumRepo Zephir -Zsh diff --git a/tests/Sanity-test-for-ctags/ctags-maps-list b/tests/Sanity-test-for-ctags/ctags-maps-list index 6d9096b..676218a 100644 --- a/tests/Sanity-test-for-ctags/ctags-maps-list +++ b/tests/Sanity-test-for-ctags/ctags-maps-list @@ -8,12 +8,10 @@ Asm *.A51 *.29[kK] *.[68][68][kKsSxX] *.[xX][68][68] *.asm *.ASM *.s *.S Asp *.asp *.asa Autoconf configure.in *.ac AutoIt *.au3 *.AU3 *.aU3 *.Au3 -Automake Makefile.am GNUmakefile.am *.am +Automake Makefile.am *.am Awk *.awk *.gawk *.mawk -Basic *.bas *.bi *.bm *.bb *.pb -Bats *.bats +Basic *.bas *.bi *.bb *.pb BETA *.bet -BibLaTeX BibTeX *.bib Clojure *.clj *.cljs *.cljc CMake CMakeLists.txt *.cmake @@ -34,26 +32,21 @@ DTS *.dts *.dtsi DosBatch *.bat *.cmd Eiffel *.e Elixir *.ex *.exs +Elm *.elm EmacsLisp *.el Erlang *.erl *.ERL *.hrl *.HRL Falcon *.fal *.ftd Flex *.as *.mxml -Forth *.fth *.forth *.fs *.4th *.f Fortran *.f *.for *.ftn *.f77 *.f90 *.f95 *.f03 *.f08 *.f15 *.F *.FOR *.FTN *.F77 *.F90 *.F95 *.F03 *.F08 *.F15 -FrontMatter FunctionParameters Fypp *.fy Gdbinit .gdbinit *.gdb -GDScript *.gd -GemSpec *.gemspec Go *.go -GPerf *.perf *.gperf Haskell *.hs Haxe *.hx HTML *.htm *.html Iniconf *.ini *.conf Inko *.inko -IPythonCell ITcl *.itcl Java *.java JavaProperties *.properties @@ -62,7 +55,6 @@ JSON *.json Julia *.jl Kconfig Kconfig* LdScript *.lds.S ld.script *.lds *.scr *.ld *.ldi -LEX *.lex *.l Lisp *.cl *.clisp *.l *.lisp *.lsp LiterateHaskell *.lhs Lua *.lua @@ -72,19 +64,18 @@ Make [Mm]akefile GNUmakefile *.mak *.mk Markdown *.md *.markdown MatLab *.m Meson meson.build -MesonOptions meson_options.txt Moose Myrddin *.myr NSIS *.nsi *.nsh ObjectiveC *.mm *.m *.h +OldC++ *.c++ *.cc *.cp *.cpp *.cxx *.h *.h++ *.hh *.hp *.hpp *.hxx *.inl *.C *.H +OldC *.c OCaml *.ml *.mli *.aug -Org *.org Passwd passwd Pascal *.p *.pas Perl *.pl *.pm *.ph *.plx *.perl -Perl6 *.p6 *.pm6 *.pm *.pl6 *.t6 +Perl6 *.p6 *.pm6 *.pm *.pl6 PHP *.php *.php3 *.php4 *.php5 *.php7 *.phtml -PkgConfig *.pc Pod *.pod PowerShell *.ps1 *.psm1 Protobuf *.proto @@ -93,16 +84,11 @@ Python *.py *.pyx *.pxd *.pxi *.scons *.wsgi PythonLoggingConfig QemuHX *.hx QtMoc -Quarto *.qmd -RMarkdown *.rmd R *.r *.R *.s *.q -Rake Rakefile *.rake -Raku *.raku *.rakumod *.rakutest *.rakudoc R6Class RSpec REXX *.cmd *.rexx *.rx Robot *.robot -RpmMacros RpmSpec *.spec ReStructuredText *.rest *.reST *.rst Ruby *.rb *.ruby @@ -110,7 +96,7 @@ Rust *.rs S4Class Scheme *.SCM *.SM *.sch *.scheme *.scm *.sm *.rkt SCSS *.scss -Sh *.sh *.SH *.bsh *.bash *.ksh *.ash +Sh *.sh *.SH *.bsh *.bash *.ksh *.zsh *.ash SLang *.sl SML *.sml *.sig SQL *.sql @@ -118,14 +104,11 @@ SystemdUnit *.service *.socket *.device *.mount *.automount *.swap *.target *.pa SystemTap *.stp *.stpm Tcl *.tcl *.tk *.wish *.exp TclOO -Terraform *.tf -TerraformVariables *.tfvars Tex *.tex TeXBeamer TTCN *.ttcn *.ttcn3 Txt2tags *.t2t *.t2t TypeScript *.ts -V *.v Vera *.vr *.vri *.vrh Verilog *.v SystemVerilog *.sv *.svh *.svi @@ -135,21 +118,15 @@ WindRes *.rc YACC *.y YumRepo *.repo Zephir *.zep -Zsh *.zsh DBusIntrospect *.xml Glade *.glade Maven2 pom.xml *.pom *.xml PlistXML *.plist RelaxNG *.rng SVG *.svg -XRC *.xrc XML *.xml XSLT *.xsl *.xslt -Yaml *.yml *.yaml +Yaml *.yml AnsiblePlaybook -I18nRubyGem -OpenAPI openapi.yaml Varlink *.varlink Kotlin *.kt *.kts -Thrift *.thrift -Elm *.elm diff --git a/tests/Sanity-test-for-ctags/main.fmf b/tests/Sanity-test-for-ctags/main.fmf deleted file mode 100644 index a15acec..0000000 --- a/tests/Sanity-test-for-ctags/main.fmf +++ /dev/null @@ -1,13 +0,0 @@ -summary: Run tests in all contexts -description: '' -contact: Than Ngo -component: - - ctags -test: ./runtest.sh -framework: beakerlib -recommend: - - ctags - - man-db -duration: 5m -extra-summary: /CoreOS/ctags/Sanity-test-for-ctags -extra-task: /CoreOS/ctags/Sanity-test-for-ctags diff --git a/tests/Sanity-test-for-ctags/runtest.sh b/tests/Sanity-test-for-ctags/runtest.sh index 52c366e..d952395 100755 --- a/tests/Sanity-test-for-ctags/runtest.sh +++ b/tests/Sanity-test-for-ctags/runtest.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/sh # ctags basics PACKAGES="ctags" @@ -6,6 +6,7 @@ PACKAGES="ctags" # source the test script helpers # requires beakerlib package +. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 rlJournalStart diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..6ec7675 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +--- +# Run tests in all contexts +- hosts: localhost + tags: + - classic + roles: + - role: standard-test-beakerlib + tests: + - Sanity-test-for-ctags + required_packages: + - ctags + - man-db